BindingEditor.lua

local addonName, DF = ...

-- Get module namespace
local CC = DF.ClickCast
local L = DF.L
local format = string.format

-- Local aliases for shared constants (defined in Constants.lua)
local DEFAULT_BINDING_SCOPE = CC.DEFAULT_BINDING_SCOPE
local DEFAULT_BINDING_COMBAT = CC.DEFAULT_BINDING_COMBAT
local DEFAULT_TARGET_TYPE = CC.DEFAULT_TARGET_TYPE
local TARGET_INFO = CC.TARGET_INFO
local FRAME_INFO = CC.FRAME_INFO
local FALLBACK_INFO = CC.FALLBACK_INFO
local COMBAT_INFO = CC.COMBAT_INFO

-- Local alias for shared UI tables (defined in UI/Main.lua)
-- spellCells is now accessed via CC.spellCells

-- Local alias for UI constants (defined in UI/Main.lua)
local BINDING_ROW_HEIGHT = CC.BINDING_ROW_HEIGHT or 48

-- Local alias for helper functions (defined in Bindings.lua)
local function GetSpellDisplayInfo(a, b) 
    if CC.GetSpellDisplayInfo then 
        return CC.GetSpellDisplayInfo(a, b) 
    else
        -- Fallback if function not available
        local name = b or (a and C_Spell.GetSpellName and C_Spell.GetSpellName(a)) or "Unknown"
        local icon = a and C_Spell.GetSpellTexture and C_Spell.GetSpellTexture(a) or 134400
        return name, icon, a
    end
end

-- Local alias for helper functions (defined in UI/Main.lua)
local function GetFallbackDisplayText(f) return CC.GetFallbackDisplayText and CC.GetFallbackDisplayText(f) or nil end

-- Local alias for helper functions (defined in UI/ProfilesPanel.lua)
local function ShowPopupOnTop(name) return CC.ShowPopupOnTop and CC.ShowPopupOnTop(name) or StaticPopup_Show(name) end

-- ADD/EDIT BINDING DIALOG
-- ============================================================

local addBindingDialog = nil

function CC:ShowAddBindingDialog(onComplete, existingBinding, existingIndex)
    if addBindingDialog then
        addBindingDialog:Hide()
    end
    
    -- Theme colors (matching GUI/GUI.lua)
    local themeColor = DF.GUI and DF.GUI.GetThemeColor and DF.GUI.GetThemeColor() or {r = 0.45, g = 0.45, b = 0.95}
    local C_BACKGROUND = {r = 0.08, g = 0.08, b = 0.08}
    local C_PANEL = {r = 0.12, g = 0.12, b = 0.12}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.6, g = 0.6, b = 0.6}
    
    -- Create dialog
    addBindingDialog = CreateFrame("Frame", "DFClickCastAddDialog", UIParent, "BackdropTemplate")
    addBindingDialog:SetSize(420, 430)  -- Start at collapsed height
    addBindingDialog:SetPoint("CENTER", 0, 50)
    addBindingDialog:SetFrameStrata("FULLSCREEN_DIALOG")
    addBindingDialog:SetFrameLevel(100)
    addBindingDialog:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    addBindingDialog:SetBackdropColor(C_BACKGROUND.r, C_BACKGROUND.g, C_BACKGROUND.b, 0.98)
    addBindingDialog:SetBackdropBorderColor(0, 0, 0, 1)
    addBindingDialog:EnableMouse(true)
    addBindingDialog:SetMovable(true)
    addBindingDialog:RegisterForDrag("LeftButton")
    addBindingDialog:SetScript("OnDragStart", addBindingDialog.StartMoving)
    addBindingDialog:SetScript("OnDragStop", addBindingDialog.StopMovingOrSizing)
    
    -- Title
    local title = addBindingDialog:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    title:SetPoint("TOPLEFT", 12, -12)
    title:SetText(existingBinding and L["Edit Binding"] or L["Add New Binding"])
    title:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    
    -- Close button
    local closeBtn = CreateFrame("Button", nil, addBindingDialog, "BackdropTemplate")
    closeBtn:SetPoint("TOPRIGHT", -6, -6)
    closeBtn:SetSize(20, 20)
    closeBtn:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    closeBtn:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    closeBtn:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    
    local closeIcon = closeBtn:CreateTexture(nil, "OVERLAY")
    closeIcon:SetPoint("CENTER", 0, 0)
    closeIcon:SetSize(12, 12)
    closeIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\close")
    closeIcon:SetVertexColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    closeBtn:SetScript("OnClick", function() addBindingDialog:Hide() end)
    closeBtn:SetScript("OnEnter", function() 
        closeBtn:SetBackdropBorderColor(1, 0.4, 0.4, 1)
        closeIcon:SetVertexColor(1, 0.4, 0.4) 
    end)
    closeBtn:SetScript("OnLeave", function() 
        closeBtn:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
        closeIcon:SetVertexColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b) 
    end)
    
    -- Working binding data
    local bindingData = existingBinding and CopyTable(existingBinding) or {
        enabled = true,
        button = "LeftButton",
        modifiers = "",
        actionType = "spell",
        spellId = nil,
        spellName = nil,
        macroText = nil,
        loadSpec = nil,
        loadCombat = nil,
        priority = 5,  -- Default priority (1=highest, 10=lowest)
    }
    
    local yOffset = -45
    
    -- STEP 1: Key Combination
    local step1Label = addBindingDialog:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    step1Label:SetPoint("TOPLEFT", 15, yOffset)
    step1Label:SetText(L["Step 1: Click here with desired key combo"])
    step1Label:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    yOffset = yOffset - 20
    
    local keyCaptureBtn = CreateFrame("Button", nil, addBindingDialog, "BackdropTemplate")
    keyCaptureBtn:SetPoint("TOPLEFT", 15, yOffset)
    keyCaptureBtn:SetSize(390, 32)
    keyCaptureBtn:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    keyCaptureBtn:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    keyCaptureBtn:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    keyCaptureBtn:RegisterForClicks("AnyDown", "AnyUp")
    
    local keyText = keyCaptureBtn:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    keyText:SetPoint("CENTER")
    
    local function UpdateKeyText()
        keyText:SetText(CC:GetBindingDisplayString(bindingData))
        keyText:SetTextColor(themeColor.r, themeColor.g, themeColor.b)
    end
    UpdateKeyText()
    
    keyCaptureBtn:SetScript("OnClick", function(self, button)
        local mods = ""
        if IsShiftKeyDown() then mods = mods .. "shift-" end
        if IsControlKeyDown() then mods = mods .. "ctrl-" end
        if IsAltKeyDown() then mods = mods .. "alt-" end
        if IsMetaKeyDown() then mods = mods .. "meta-" end
        
        bindingData.button = button
        bindingData.modifiers = mods
        UpdateKeyText()
        
        -- Warn Mac users about Command+Left Click limitation (right click works fine)
        if mods:find("meta") and button == "LeftButton" then
            CC:ShowMacMetaClickWarning()
        end
    end)
    
    -- Mac warning label (only shown on Mac)
    if IsMacClient and IsMacClient() then
        local macWarning = addBindingDialog:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
        macWarning:SetPoint("TOPLEFT", keyCaptureBtn, "BOTTOMLEFT", 0, -2)
        macWarning:SetWidth(390)
        macWarning:SetJustifyH("LEFT")
        macWarning:SetText("|cffff9900" .. L["Note: Cmd + Left Click unavailable on Mac"])
        macWarning:SetTextColor(0.9, 0.6, 0.2)
        yOffset = yOffset - 12  -- Extra space for the warning
    end
    
    yOffset = yOffset - 45
    
    -- STEP 2: Action Selection (spell list with Target/Menu at top)
    local step2Label = addBindingDialog:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    step2Label:SetPoint("TOPLEFT", 15, yOffset)
    step2Label:SetText(L["Step 2: Select Action"])
    step2Label:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    yOffset = yOffset - 20
    
    -- Search box for filtering spells
    local spellBox = CreateFrame("EditBox", nil, addBindingDialog, "BackdropTemplate")
    spellBox:SetPoint("TOPLEFT", 15, yOffset)
    spellBox:SetSize(390, 26)
    spellBox:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    spellBox:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    spellBox:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    DF.GUI:SetSettingsFont(spellBox, 11, "")
    spellBox:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    spellBox:SetTextInsets(24, 8, 0, 0)
    spellBox:SetAutoFocus(false)
    spellBox:SetText("")
    
    -- Search icon
    local spellSearchIcon = spellBox:CreateTexture(nil, "OVERLAY")
    spellSearchIcon:SetPoint("LEFT", 6, 0)
    spellSearchIcon:SetSize(12, 12)
    spellSearchIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\search")
    spellSearchIcon:SetVertexColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    -- Placeholder text
    local placeholder = spellBox:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    placeholder:SetPoint("LEFT", 24, 0)
    placeholder:SetText(L["Search spells..."])
    placeholder:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    spellBox:SetScript("OnEditFocusGained", function() placeholder:Hide() end)
    spellBox:SetScript("OnEditFocusLost", function() 
        if spellBox:GetText() == "" then placeholder:Show() end 
    end)
    
    yOffset = yOffset - 32
    
    -- Selection display
    local selectionFrame = CreateFrame("Frame", nil, addBindingDialog, "BackdropTemplate")
    selectionFrame:SetPoint("TOPLEFT", 15, yOffset)
    selectionFrame:SetSize(390, 28)
    selectionFrame:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    selectionFrame:SetBackdropColor(C_PANEL.r, C_PANEL.g, C_PANEL.b, 1)
    selectionFrame:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    
    local selectionIcon = selectionFrame:CreateTexture(nil, "ARTWORK")
    selectionIcon:SetPoint("LEFT", 6, 0)
    selectionIcon:SetSize(20, 20)
    selectionIcon:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark") -- Default question mark
    selectionIcon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
    
    local selectionText = selectionFrame:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    selectionText:SetPoint("LEFT", selectionIcon, "RIGHT", 8, 0)
    selectionText:SetText(L["No action selected"])
    selectionText:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    -- Track if valid selection was made
    local validSelection = false
    
    local function UpdateSelection(actionType, spellName, icon)
        bindingData.actionType = actionType
        bindingData.spellName = spellName
        validSelection = true
        
        if actionType == "target" then
            selectionIcon:SetTexture(132212) -- Target icon
            selectionText:SetText(L["Target Unit"])
        elseif actionType == "menu" then
            selectionIcon:SetTexture(134331) -- Menu icon
            selectionText:SetText(L["Open Unit Menu"])
        else
            selectionIcon:SetTexture(icon or "Interface\\Icons\\INV_Misc_QuestionMark")
            selectionText:SetText(spellName or "Unknown Spell")
        end
        selectionText:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
        selectionFrame:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
    end
    
    -- Pre-populate if editing existing binding
    if existingBinding then
        if existingBinding.actionType == "target" then
            UpdateSelection("target", nil, nil)
        elseif existingBinding.actionType == "menu" then
            UpdateSelection("menu", nil, nil)
        elseif existingBinding.spellName then
            local icon = CC:GetSpellIcon(existingBinding.spellName)
            UpdateSelection("spell", existingBinding.spellName, icon)
        end
    end
    
    yOffset = yOffset - 35
    
    -- Action list (Target/Menu + Spells)
    local spellScrollFrame = CreateFrame("ScrollFrame", nil, addBindingDialog, "ScrollFrameTemplate")
    spellScrollFrame:SetPoint("TOPLEFT", 15, yOffset)
    spellScrollFrame:SetSize(375, 130)
    DF.GUI.StyleScrollBar(spellScrollFrame)

    local spellListContent = CreateFrame("Frame", nil, spellScrollFrame)
    spellListContent:SetSize(360, 1)
    spellScrollFrame:SetScrollChild(spellListContent)
    
    local spellButtons = {}
    
    local function CreateActionButton(parent, yPos, icon, text, onClick)
        local btn = CreateFrame("Button", nil, parent)
        btn:SetPoint("TOPLEFT", 0, -yPos)
        btn:SetSize(360, 22)
        
        local iconTex = btn:CreateTexture(nil, "ARTWORK")
        iconTex:SetPoint("LEFT", 4, 0)
        iconTex:SetSize(18, 18)
        iconTex:SetTexture(icon)
        iconTex:SetTexCoord(0.08, 0.92, 0.08, 0.92)
        
        local nameText = btn:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
        nameText:SetPoint("LEFT", iconTex, "RIGHT", 8, 0)
        nameText:SetText(text)
        
        local highlight = btn:CreateTexture(nil, "HIGHLIGHT")
        highlight:SetAllPoints()
        highlight:SetColorTexture(themeColor.r, themeColor.g, themeColor.b, 0.3)
        
        btn:SetScript("OnClick", onClick)
        
        return btn
    end
    
    local function PopulateSpellList(searchText)
        for _, btn in ipairs(spellButtons) do
            btn:Hide()
            btn:SetParent(nil)
        end
        wipe(spellButtons)
        
        local yPos = 0
        searchText = searchText or ""
        local searchLower = searchText:lower()
        
        -- Add Target Unit at top (if matches search or no search)
        if searchText == "" or ("target unit"):find(searchLower, 1, true) then
            local btn = CreateActionButton(spellListContent, yPos, 132212, "|cff88ff88Target Unit|r", function()
                UpdateSelection("target", nil, nil)
            end)
            table.insert(spellButtons, btn)
            yPos = yPos + 24
        end
        
        -- Add Open Menu at top (if matches search or no search)
        if searchText == "" or ("open menu"):find(searchLower, 1, true) or ("unit menu"):find(searchLower, 1, true) then
            local btn = CreateActionButton(spellListContent, yPos, 134331, "|cff88ff88Open Unit Menu|r", function()
                UpdateSelection("menu", nil, nil)
            end)
            table.insert(spellButtons, btn)
            yPos = yPos + 24
        end
        
        -- Add separator if we have special items and spells
        if yPos > 0 and searchText == "" then
            local sep = spellListContent:CreateTexture(nil, "ARTWORK")
            sep:SetPoint("TOPLEFT", 0, -yPos)
            sep:SetSize(360, 1)
            sep:SetColorTexture(0.3, 0.3, 0.3, 0.5)
            yPos = yPos + 6
        end
        
        -- Add spells from spellbook
        local spells = CC:SearchSpellbook(searchText)
        
        for i, spell in ipairs(spells) do
            if i > 30 then break end
            
            -- Use displayName from search results (already has override applied)
            local displayName = spell.displayName or spell.name
            local displayIcon = spell.icon
            
            -- Show override name/icon, but pass BASE spell name for binding
            local btn = CreateActionButton(spellListContent, yPos, displayIcon, displayName, function()
                UpdateSelection("spell", spell.name, displayIcon)  -- spell.name is the base name
            end)
            table.insert(spellButtons, btn)
            yPos = yPos + 24
        end
        
        spellListContent:SetHeight(math.max(1, yPos))
    end
    
    spellBox:SetScript("OnTextChanged", function(self)
        local text = self:GetText()
        if text == "" then
            placeholder:Show()
        else
            placeholder:Hide()
        end
        PopulateSpellList(text)
    end)
    
    PopulateSpellList("")
    
    yOffset = yOffset - 145
    
    -- STEP 3: Combat Condition
    local step3Label = addBindingDialog:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    step3Label:SetPoint("TOPLEFT", 15, yOffset)
    step3Label:SetText(L["Step 3: Combat Condition (optional)"])
    step3Label:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    yOffset = yOffset - 20
    
    local combatOptions = {
        {value = nil, label = L["Always"]},
        {value = "combat", label = L["In Combat Only"]},
        {value = "nocombat", label = L["Out of Combat Only"]},
    }
    
    local combatButtons = {}
    xPos = 15
    
    local function UpdateCombatButtons()
        for key, b in pairs(combatButtons) do
            local isSelected = (key == "always" and not bindingData.loadCombat) or (key == bindingData.loadCombat)
            if isSelected then
                b:SetBackdropColor(themeColor.r * 0.3, themeColor.g * 0.3, themeColor.b * 0.3, 1)
                b:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
                b.label:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
            else
                b:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
                b:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
                b.label:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
            end
        end
    end
    
    for _, opt in ipairs(combatOptions) do
        local btn = CreateFrame("Button", nil, addBindingDialog, "BackdropTemplate")
        btn:SetPoint("TOPLEFT", xPos, yOffset)
        btn:SetSize(125, 26)
        btn:SetBackdrop({
            bgFile = "Interface\\Buttons\\WHITE8x8",
            edgeFile = "Interface\\Buttons\\WHITE8x8",
            edgeSize = 1,
        })
        
        local label = btn:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
        label:SetPoint("CENTER")
        label:SetText(opt.label)
        btn.label = label
        
        combatButtons[opt.value or "always"] = btn
        
        btn:SetScript("OnClick", function()
            bindingData.loadCombat = opt.value
            UpdateCombatButtons()
        end)
        
        xPos = xPos + 130
    end
    
    UpdateCombatButtons()
    yOffset = yOffset - 50
    
    -- SAVE / CANCEL BUTTONS
    local saveBtn = CreateFrame("Button", nil, addBindingDialog, "BackdropTemplate")
    saveBtn:SetPoint("BOTTOMRIGHT", -95, 12)
    saveBtn:SetSize(80, 26)
    saveBtn:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    saveBtn:SetBackdropColor(themeColor.r * 0.3, themeColor.g * 0.3, themeColor.b * 0.3, 1)
    saveBtn:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
    
    local saveIcon = saveBtn:CreateTexture(nil, "OVERLAY")
    saveIcon:SetPoint("LEFT", 12, 0)
    saveIcon:SetSize(14, 14)
    saveIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\save")
    saveIcon:SetVertexColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    local saveLabel = saveBtn:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    saveLabel:SetPoint("LEFT", saveIcon, "RIGHT", 4, 0)
    saveLabel:SetText(L["Save"])
    saveLabel:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    
    saveBtn:SetScript("OnEnter", function()
        saveBtn:SetBackdropColor(themeColor.r * 0.5, themeColor.g * 0.5, themeColor.b * 0.5, 1)
    end)
    saveBtn:SetScript("OnLeave", function()
        saveBtn:SetBackdropColor(themeColor.r * 0.3, themeColor.g * 0.3, themeColor.b * 0.3, 1)
    end)
    
    local function DoSave()
        local success = true
        if existingIndex then
            success = CC:UpdateBinding(existingIndex, bindingData)
        else
            success = CC:AddBinding(bindingData) ~= nil
        end
        
        if not success then
            -- Duplicate found, don't close dialog
            return
        end
        
        addBindingDialog:Hide()
        
        if onComplete then
            onComplete()
        end
    end
    
    saveBtn:SetScript("OnClick", function()
        -- Validate that an action was selected
        if not validSelection then
            -- Flash the selection frame red
            selectionFrame:SetBackdropBorderColor(1, 0.3, 0.3, 1)
            selectionText:SetText(L["Please select an action!"])
            selectionText:SetTextColor(1, 0.4, 0.4)
            C_Timer.After(2, function()
                if not validSelection then
                    selectionFrame:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
                    selectionText:SetText(L["No action selected"])
                    selectionText:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
                end
            end)
            return
        end
        
        -- Save the binding (multiple bindings on same key allowed for fallback functionality)
        DoSave()
    end)
    
    local cancelBtn = CreateFrame("Button", nil, addBindingDialog, "BackdropTemplate")
    cancelBtn:SetPoint("BOTTOMRIGHT", -10, 12)
    cancelBtn:SetSize(80, 26)
    cancelBtn:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    cancelBtn:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    cancelBtn:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    
    local cancelLabel = cancelBtn:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    cancelLabel:SetPoint("CENTER")
    cancelLabel:SetText(L["Cancel"])
    cancelLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    cancelBtn:SetScript("OnEnter", function()
        cancelBtn:SetBackdropColor(0.25, 0.25, 0.25, 1)
        cancelLabel:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    end)
    cancelBtn:SetScript("OnLeave", function()
        cancelBtn:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
        cancelLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    end)
    
    cancelBtn:SetScript("OnClick", function()
        addBindingDialog:Hide()
    end)
    
    addBindingDialog:Show()
end

-- ============================================================

-- ============================================================
-- BINDING ROW DRAG-TO-REORDER
-- Handle + floating ghost + insert indicator for drag reordering
-- ============================================================

local reorderState = nil        -- active drag state
local reorderGhost = nil        -- floating cursor-follower frame
local reorderIndicator = nil    -- insert-position line
local reorderUpdater = nil      -- OnUpdate driver

-- Build the ordered list of currently-visible (enabled) bindings.
local function BuildVisibleSequence()
    local seq = {}
    local bindings = CC.db and CC.db.bindings or {}
    for _, b in ipairs(bindings) do
        if b.enabled ~= false then
            table.insert(seq, b)
        end
    end
    return seq
end

-- Compute drop zone index (0 .. N) from cursor Y against bindingsContent.
-- Zone 0 = insert before first row, Zone N = insert after last row.
local function ComputeDropZone(visibleCount)
    local content = CC.bindingsContent
    if not content or visibleCount <= 0 then return 0 end
    local scale = content:GetEffectiveScale()
    local _, cy = GetCursorPosition()
    cy = cy / scale
    local top = content:GetTop()
    if not top then return 0 end
    local relY = top - cy  -- distance from content top, in pixels
    local rowH = BINDING_ROW_HEIGHT
    local zone = math.floor(relY / rowH + 0.5)
    if zone < 0 then zone = 0 end
    if zone > visibleCount then zone = visibleCount end
    return zone
end

local function EnsureGhost()
    if reorderGhost then return reorderGhost end
    local C = CC.UI_COLORS
    local theme = C and C.theme or { r = 1, g = 1, b = 1 }
    local g = CreateFrame("Frame", nil, UIParent, "BackdropTemplate")
    g:SetFrameStrata("TOOLTIP")
    g:SetSize(220, 34)
    g:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    g:SetBackdropColor(0, 0, 0, 0.88)
    g:SetBackdropBorderColor(theme.r, theme.g, theme.b, 1)
    local gi = g:CreateTexture(nil, "ARTWORK")
    gi:SetSize(24, 24)
    gi:SetPoint("LEFT", 4, 0)
    gi:SetTexCoord(0.08, 0.92, 0.08, 0.92)
    g.icon = gi
    local gt = g:CreateFontString(nil, "OVERLAY", "GameFontHighlight")
    gt:SetPoint("LEFT", gi, "RIGHT", 6, 0)
    gt:SetPoint("RIGHT", -6, 0)
    gt:SetJustifyH("LEFT")
    gt:SetWordWrap(false)
    g.text = gt
    g:Hide()
    reorderGhost = g
    return g
end

local function EnsureIndicator()
    if reorderIndicator then return reorderIndicator end
    local content = CC.bindingsContent
    if not content then return nil end
    local C = CC.UI_COLORS
    local theme = C and C.theme or { r = 1, g = 1, b = 1 }
    local ind = content:CreateTexture(nil, "OVERLAY")
    ind:SetHeight(2)
    ind:SetColorTexture(theme.r, theme.g, theme.b, 1)
    ind:Hide()
    reorderIndicator = ind
    return ind
end

local function UpdateReorderVisuals()
    if not reorderState then return end
    local ghost = reorderGhost
    if ghost then
        local scale = UIParent:GetEffectiveScale()
        local cx, cy = GetCursorPosition()
        ghost:ClearAllPoints()
        ghost:SetPoint("TOPLEFT", UIParent, "BOTTOMLEFT", cx / scale + 14, cy / scale - 4)
    end
    local content = CC.bindingsContent
    local ind = reorderIndicator
    if content and ind then
        local zone = ComputeDropZone(reorderState.visibleCount)
        reorderState.dropZone = zone
        ind:ClearAllPoints()
        ind:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -zone * BINDING_ROW_HEIGHT + 1)
        ind:SetPoint("TOPRIGHT", content, "TOPRIGHT", 0, -zone * BINDING_ROW_HEIGHT + 1)
        ind:Show()
    end
end

local function BeginBindingReorder(row, binding)
    if InCombatLockdown() then return end  -- be defensive, though this is non-secure UI
    if not CC.db or not CC.db.bindings then return end
    local seq = BuildVisibleSequence()
    local sourceVisibleIdx
    for i, b in ipairs(seq) do
        if b == binding then sourceVisibleIdx = i; break end
    end
    if not sourceVisibleIdx then return end

    reorderState = {
        sourceBinding = binding,
        sourceRow = row,
        sourceVisibleIdx = sourceVisibleIdx,
        visibleCount = #seq,
        dropZone = sourceVisibleIdx - 1,
    }

    row:SetAlpha(0.4)

    local ghost = EnsureGhost()
    if ghost then
        if row.icon and row.icon.GetTexture then
            ghost.icon:SetTexture(row.icon:GetTexture())
            ghost.icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
        end
        if row.name and row.name.GetText then
            ghost.text:SetText(row.name:GetText() or "")
        end
        ghost:Show()
    end

    EnsureIndicator()

    if not reorderUpdater then
        reorderUpdater = CreateFrame("Frame")
        reorderUpdater:SetScript("OnUpdate", UpdateReorderVisuals)
    end
    reorderUpdater:Show()
    UpdateReorderVisuals()
end

local function CancelBindingReorder()
    if reorderState and reorderState.sourceRow then
        reorderState.sourceRow:SetAlpha(1)
    end
    reorderState = nil
    if reorderGhost then reorderGhost:Hide() end
    if reorderIndicator then reorderIndicator:Hide() end
    if reorderUpdater then reorderUpdater:Hide() end
end

local function EndBindingReorder()
    if not reorderState then return end
    local state = reorderState
    local sourceBinding = state.sourceBinding
    local sourceVisibleIdx = state.sourceVisibleIdx
    local targetZone = state.dropZone or (sourceVisibleIdx - 1)

    -- Clean up visuals first (avoid flash during Refresh)
    if reorderGhost then reorderGhost:Hide() end
    if reorderIndicator then reorderIndicator:Hide() end
    if reorderUpdater then reorderUpdater:Hide() end
    if state.sourceRow then state.sourceRow:SetAlpha(1) end
    reorderState = nil

    -- No-op if dropped in its current slot (zones sourceIdx-1 or sourceIdx both mean "stay put")
    if targetZone == sourceVisibleIdx - 1 or targetZone == sourceVisibleIdx then
        return
    end

    local seq = BuildVisibleSequence()
    -- Re-resolve source index in case array changed underneath
    local curSource
    for i, b in ipairs(seq) do
        if b == sourceBinding then curSource = i; break end
    end
    if not curSource then return end

    table.remove(seq, curSource)
    local insertAt = targetZone
    if curSource < targetZone then insertAt = insertAt - 1 end
    insertAt = math.max(0, math.min(#seq, insertAt))
    table.insert(seq, insertAt + 1, sourceBinding)

    -- Rebuild CC.db.bindings, preserving disabled entries in their original slots
    local oldDb = CC.db.bindings
    local newDb = {}
    local seqIdx = 1
    for _, b in ipairs(oldDb) do
        if b.enabled ~= false then
            newDb[#newDb + 1] = seq[seqIdx]
            seqIdx = seqIdx + 1
        else
            newDb[#newDb + 1] = b
        end
    end
    CC.db.bindings = newDb

    if CC.ApplyBindings then CC:ApplyBindings() end
    if CC.RefreshActiveBindings then CC:RefreshActiveBindings() end
    if CC.RefreshSpellGrid then CC:RefreshSpellGrid(true) end
end

-- =========================================================================
-- ACTIVE BINDINGS ROW CREATION
-- =========================================================================
function CC:CreateBindingRow(parent, binding, index)
    local C = self.UI_COLORS
    local themeColor = C.theme
    
    local row = CreateFrame("Button", nil, parent, "BackdropTemplate")
    row:SetHeight(BINDING_ROW_HEIGHT - 2)
    row:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    row:SetBackdropColor(C.element.r, C.element.g, C.element.b, 0.8)
    row:SetBackdropBorderColor(C.border.r, C.border.g, C.border.b, 0.5)
    
    -- Icon (larger to fill height better)
    local icon = row:CreateTexture(nil, "ARTWORK")
    icon:SetSize(32, 32)
    icon:SetPoint("LEFT", 14, 0)  -- Shifted right to make room for drag handle
    
    -- Set icon based on action type
    if binding.actionType == "target" then
        icon:SetTexture("Interface\\CURSOR\\Crosshairs")
    elseif binding.actionType == "menu" then
        icon:SetTexture("Interface\\Buttons\\UI-GuildButton-OfficerNote-Up")
    elseif binding.actionType == "focus" then
        icon:SetTexture("Interface\\Icons\\Ability_Hunter_MasterMarksman")
    elseif binding.actionType == "assist" then
        icon:SetTexture("Interface\\Icons\\Ability_Hunter_SniperShot")
    elseif binding.actionType == CC.ACTION_TYPES.ITEM then
        -- Item binding
        if binding.itemType == "slot" and binding.itemSlot then
            local itemInfo = CC:GetSlotItemInfo(binding.itemSlot)
            if itemInfo and itemInfo.icon then
                icon:SetTexture(itemInfo.icon)
            else
                -- Use slot default icon
                for _, slotData in ipairs(CC.EQUIPMENT_SLOTS) do
                    if slotData.slot == binding.itemSlot then
                        icon:SetTexture(slotData.icon)
                        break
                    end
                end
            end
        elseif binding.itemId then
            local itemInfo = CC:GetItemInfoById(binding.itemId)
            if itemInfo and itemInfo.icon then
                icon:SetTexture(itemInfo.icon)
            else
                icon:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark")
            end
        else
            icon:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark")
        end
    elseif binding.actionType == "macro" and binding.macroId then
        local macro = CC:GetMacroById(binding.macroId)
        if macro then
            -- Try to auto-detect icon from macro body first
            local autoIcon = CC:GetIconFromMacroBody(macro.body)
            if autoIcon then
                icon:SetTexture(autoIcon)
            elseif macro.icon and type(macro.icon) == "number" and macro.icon > 0 then
                icon:SetTexture(macro.icon)
            else
                icon:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark")
            end
        else
            icon:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark")
        end
    elseif binding.spellId or binding.spellName then
        -- Get current display icon (accounts for talent overrides like Divine Toll -> Holy Armaments)
        local _, displayIcon = GetSpellDisplayInfo(binding.spellId, binding.spellName)
        icon:SetTexture(displayIcon or "Interface\\Icons\\INV_Misc_QuestionMark")
    else
        icon:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark")
    end
    icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
    row.icon = icon

    -- Drag handle (far left, thin strip for reordering)
    local dragHandle = CreateFrame("Button", nil, row)
    dragHandle:SetPoint("TOPLEFT", 0, 0)
    dragHandle:SetPoint("BOTTOMLEFT", 0, 0)
    dragHandle:SetWidth(10)
    dragHandle:RegisterForDrag("LeftButton")
    dragHandle:EnableMouse(true)

    local handleIcon = dragHandle:CreateTexture(nil, "OVERLAY")
    handleIcon:SetSize(8, 14)
    handleIcon:SetPoint("CENTER")
    handleIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\reorder")
    handleIcon:SetVertexColor(C.textDim.r, C.textDim.g, C.textDim.b)

    dragHandle:SetScript("OnEnter", function(self)
        handleIcon:SetVertexColor(themeColor.r, themeColor.g, themeColor.b)
        SetCursor("Interface\\CURSOR\\UI-Cursor-Move")
        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
        GameTooltip:AddLine(L["Drag to reorder"], 1, 1, 1)
        GameTooltip:Show()
    end)
    dragHandle:SetScript("OnLeave", function()
        handleIcon:SetVertexColor(C.textDim.r, C.textDim.g, C.textDim.b)
        SetCursor(nil)
        GameTooltip:Hide()
    end)
    dragHandle:SetScript("OnDragStart", function()
        BeginBindingReorder(row, binding)
    end)
    dragHandle:SetScript("OnDragStop", function()
        EndBindingReorder()
    end)
    row.dragHandle = dragHandle

    -- Delete button (far right)
    local deleteBtn = CreateFrame("Button", nil, row)
    deleteBtn:SetSize(20, 20)
    deleteBtn:SetPoint("RIGHT", -4, 0)
    
    local deleteIcon = deleteBtn:CreateTexture(nil, "OVERLAY")
    deleteIcon:SetPoint("CENTER")
    deleteIcon:SetSize(10, 10)
    deleteIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\close")
    deleteIcon:SetVertexColor(C.textDim.r, C.textDim.g, C.textDim.b)
    
    deleteBtn:SetScript("OnEnter", function()
        deleteIcon:SetVertexColor(1, 0.3, 0.3)
    end)
    deleteBtn:SetScript("OnLeave", function()
        deleteIcon:SetVertexColor(C.textDim.r, C.textDim.g, C.textDim.b)
    end)
    deleteBtn:SetScript("OnClick", function()
        for i, b in ipairs(CC.db.bindings) do
            if b == binding then
                table.remove(CC.db.bindings, i)
                break
            end
        end
        CC:ApplyBindings()
        CC:RefreshActiveBindings()
        CC:RefreshSpellGrid(true)  -- Skip scroll reset to maintain position
    end)
    row.deleteBtn = deleteBtn
    
    -- Format keybind display
    local bindText = ""
    if binding.bindType == "mouse" then
        local modDisplay = ""
        if binding.modifiers and binding.modifiers ~= "" then
            local mods = binding.modifiers:lower()
            if mods:find("shift") then modDisplay = modDisplay .. "Shift+" end
            if mods:find("ctrl") then modDisplay = modDisplay .. "Ctrl+" end
            if mods:find("alt") then modDisplay = modDisplay .. "Alt+" end
            if mods:find("meta") then modDisplay = modDisplay .. "Cmd+" end
        end
        local buttonName = CC.BUTTON_DISPLAY_NAMES[binding.button] or binding.button
        bindText = modDisplay .. buttonName
    elseif binding.bindType == "key" then
        local modDisplay = ""
        if binding.modifiers and binding.modifiers ~= "" then
            local mods = binding.modifiers:lower()
            if mods:find("shift") then modDisplay = modDisplay .. "Shift+" end
            if mods:find("ctrl") then modDisplay = modDisplay .. "Ctrl+" end
            if mods:find("alt") then modDisplay = modDisplay .. "Alt+" end
            if mods:find("meta") then modDisplay = modDisplay .. "Cmd+" end
        end
        local keyName = CC.KEY_DISPLAY_NAMES[binding.key] or binding.key
        bindText = modDisplay .. keyName
    elseif binding.bindType == "scroll" then
        local modDisplay = ""
        if binding.modifiers and binding.modifiers ~= "" then
            local mods = binding.modifiers:lower()
            if mods:find("shift") then modDisplay = modDisplay .. "Shift+" end
            if mods:find("ctrl") then modDisplay = modDisplay .. "Ctrl+" end
            if mods:find("alt") then modDisplay = modDisplay .. "Alt+" end
            if mods:find("meta") then modDisplay = modDisplay .. "Cmd+" end
        end
        local scrollName = CC.SCROLL_DISPLAY_NAMES[binding.key] or binding.key
        bindText = modDisplay .. scrollName
    end
    
    -- Keybind text (aligned with spell name on top line)
    local keybind = row:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    keybind:SetPoint("TOPRIGHT", row, "TOPRIGHT", -28, -6)
    keybind:SetJustifyH("RIGHT")
    keybind:SetTextColor(themeColor.r, themeColor.g, themeColor.b)
    keybind:SetText(bindText)
    row.keybind = keybind
    row.keybindText = bindText  -- Store for collapsed mode
    
    -- Content area - two lines: spell name on top, targeting info below
    local displayName = CC:GetActionDisplayString(binding)
    
    -- Spell name (top line, aligned with keybind)
    local name = row:CreateFontString(nil, "OVERLAY", "DFFontHighlight")
    name:SetPoint("TOPLEFT", icon, "TOPRIGHT", 6, -4)
    name:SetPoint("RIGHT", keybind, "LEFT", -8, 0)
    name:SetJustifyH("LEFT")
    name:SetText(displayName)
    name:SetTextColor(C.text.r, C.text.g, C.text.b)
    name:SetWordWrap(false)
    row.name = name
    
    -- Targeting info (bottom line, below spell name) - human readable format
    -- Hide fallback info for macros since they handle their own targeting
    local actionType = binding.actionType or ""
    local isMacro = (actionType == "macro") or (binding.macroId ~= nil)
    local fallback = binding.fallback or {}
    local fallbackText = isMacro and nil or GetFallbackDisplayText(fallback)
    local combatSetting = binding.combat or "always"
    
    local targetingInfo = row:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    targetingInfo:SetPoint("TOPLEFT", name, "BOTTOMLEFT", 0, -2)
    targetingInfo:SetPoint("BOTTOMRIGHT", row, "BOTTOMRIGHT", -28, 4)
    targetingInfo:SetJustifyH("LEFT")
    targetingInfo:SetJustifyV("TOP")
    targetingInfo:SetTextColor(C.textDim.r, C.textDim.g, C.textDim.b)
    targetingInfo:SetWordWrap(true)
    
    -- Build targeting description
    local targetParts = {}
    if fallbackText then
        table.insert(targetParts, fallbackText)
    end
    
    -- Add combat state if not "always"
    if combatSetting == "incombat" then
        table.insert(targetParts, L["Combat Only"])
    elseif combatSetting == "outofcombat" then
        table.insert(targetParts, L["Out of combat"])
    end
    
    if #targetParts > 0 then
        targetingInfo:SetText(table.concat(targetParts, " • "))
    else
        targetingInfo:SetText("")
    end
    row.targetingInfo = targetingInfo
    
    row.binding = binding
    row.bindingIndex = index
    
    -- Hover effect and tooltip
    row:SetScript("OnEnter", function(self)
        self:SetBackdropColor(C.element.r + 0.08, C.element.g + 0.08, C.element.b + 0.08, 1)
        self:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 0.8)
        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
        GameTooltip:AddLine(displayName, 1, 1, 1)
        GameTooltip:AddLine(bindText, themeColor.r, themeColor.g, themeColor.b)
        
        -- Show targeting info (not for macros - they handle their own targeting)
        if fallbackText and not isMacro then
            GameTooltip:AddLine(format(L["Targeting: %s"], fallbackText), C.textDim.r, C.textDim.g, C.textDim.b)
        end
        
        -- Show combat state
        if combatSetting == "incombat" then
            GameTooltip:AddLine(L["Combat Only"], C.combat.r, C.combat.g, C.combat.b)
        elseif combatSetting == "outofcombat" then
            GameTooltip:AddLine(L["Out of Combat Only"], C.nocombat.r, C.nocombat.g, C.nocombat.b)
        end
        
        -- Show frames info
        local frames = binding.frames or { dandersFrames = true, otherFrames = true }
        local framesParts = {}
        if frames.dandersFrames then table.insert(framesParts, "DandersFrames") end
        if frames.otherFrames then table.insert(framesParts, L["Other Frames"]) end
        local framesText = format(L["Frames: %s"], #framesParts > 0 and table.concat(framesParts, ", ") or "None")
        GameTooltip:AddLine(framesText, 0.6, 0.6, 0.6)
        
        GameTooltip:AddLine(" ")
        GameTooltip:AddLine(L["Click to edit"], 0.5, 0.5, 0.5)
        GameTooltip:Show()
    end)
    row:SetScript("OnLeave", function(self)
        self:SetBackdropColor(C.element.r, C.element.g, C.element.b, 0.8)
        self:SetBackdropBorderColor(C.border.r, C.border.g, C.border.b, 0.5)
        GameTooltip:Hide()
    end)
    
    -- Click handler - open edit panel
    row:SetScript("OnClick", function(self, button)
        if button == "LeftButton" then
            -- Get icon for this binding based on action type
            local bindingIcon = nil
            local actionType = binding.actionType or CC.ACTION_TYPES.SPELL
            
            if actionType == "target" then
                bindingIcon = "Interface\\CURSOR\\Crosshairs"
            elseif actionType == "menu" then
                bindingIcon = "Interface\\Buttons\\UI-GuildButton-OfficerNote-Up"
            elseif actionType == "focus" then
                bindingIcon = "Interface\\Icons\\Ability_Hunter_MasterMarksman"
            elseif actionType == "assist" then
                bindingIcon = "Interface\\Icons\\Ability_Hunter_SniperShot"
            elseif binding.spellId or binding.spellName then
                -- Get current display icon (accounts for talent overrides)
                local _, displayIcon = GetSpellDisplayInfo(binding.spellId, binding.spellName)
                bindingIcon = displayIcon
            elseif binding.macroId then
                local macro = CC:GetMacroById(binding.macroId)
                if macro then
                    -- Try auto-detect first, then stored icon
                    bindingIcon = CC:GetIconFromMacroBody(macro.body)
                    if not bindingIcon and macro.icon and type(macro.icon) == "number" and macro.icon > 0 then
                        bindingIcon = macro.icon
                    end
                end
            end
            
            -- Build spell data from binding - use current display name/icon for overrides
            local displayName, displayIcon, displaySpellId = GetSpellDisplayInfo(binding.spellId, binding.spellName)
            local spellInfo = {
                name = displayName or binding.spellName or binding.macroName or binding.actionType,
                spellId = binding.spellId,  -- Keep base spell ID for binding
                spellName = binding.spellName,  -- Keep base spell name for macro
                icon = displayIcon or bindingIcon,
                isMacro = actionType == CC.ACTION_TYPES.MACRO,
                macroId = binding.macroId,
                actionType = actionType,
                displaySpellId = displaySpellId,  -- Current override spell ID for tooltips
            }
            
            -- Open edit panel with existing binding
            CC:ShowEditBindingPanel(spellInfo, binding, self.bindingIndex)
        end
    end)
    
    return row
end

-- =========================================================================

-- EDIT BINDING PANEL (Full binding editor with scope/combat options)
-- ============================================================

function CC:CreateEditBindingPanel()
    if self.editBindingPanel then return end
    
    local themeColor = {r = 0.2, g = 0.8, b = 0.4}
    local C_BACKGROUND = {r = 0.08, g = 0.08, b = 0.08}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.5, g = 0.5, b = 0.5}
    
    -- Main panel
    local panel = CreateFrame("Frame", "DFEditBindingPanel", UIParent, "BackdropTemplate")
    panel:SetSize(320, 480)  -- Start at collapsed height
    panel:SetFrameStrata("FULLSCREEN_DIALOG")
    panel:SetFrameLevel(100)
    panel:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 2,
    })
    panel:SetBackdropColor(C_BACKGROUND.r, C_BACKGROUND.g, C_BACKGROUND.b, 0.98)
    panel:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
    panel:Hide()
    panel:SetMovable(true)
    panel:EnableMouse(true)
    panel:RegisterForDrag("LeftButton")
    panel:SetScript("OnDragStart", panel.StartMoving)
    panel:SetScript("OnDragStop", panel.StopMovingOrSizing)
    
    -- Title bar
    local titleBar = CreateFrame("Frame", nil, panel)
    titleBar:SetPoint("TOPLEFT", 0, 0)
    titleBar:SetPoint("TOPRIGHT", 0, 0)
    titleBar:SetHeight(28)
    titleBar:EnableMouse(true)
    titleBar:RegisterForDrag("LeftButton")
    titleBar:SetScript("OnDragStart", function() panel:StartMoving() end)
    titleBar:SetScript("OnDragStop", function() panel:StopMovingOrSizing() end)
    
    local title = titleBar:CreateFontString(nil, "OVERLAY", "DFFontNormalLarge")
    title:SetPoint("CENTER", titleBar, "CENTER", 0, 0)
    title:SetText(L["Edit Binding"])
    title:SetTextColor(themeColor.r, themeColor.g, themeColor.b)
    panel.title = title
    
    -- Close button
    local closeBtn = CreateFrame("Button", nil, titleBar)
    closeBtn:SetSize(20, 20)
    closeBtn:SetPoint("RIGHT", -4, 0)
    local closeIcon = closeBtn:CreateTexture(nil, "OVERLAY")
    closeIcon:SetPoint("CENTER")
    closeIcon:SetSize(12, 12)
    closeIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\close")
    closeIcon:SetVertexColor(0.8, 0.8, 0.8)
    closeBtn:SetScript("OnEnter", function() closeIcon:SetVertexColor(1, 0.3, 0.3) end)
    closeBtn:SetScript("OnLeave", function() closeIcon:SetVertexColor(0.8, 0.8, 0.8) end)
    closeBtn:SetScript("OnClick", function() CC:HideEditBindingPanel() end)
    
    -- Spell icon and name section
    local iconFrame = CreateFrame("Frame", nil, panel, "BackdropTemplate")
    iconFrame:SetPoint("TOPLEFT", 12, -36)
    iconFrame:SetSize(36, 36)
    iconFrame:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    iconFrame:SetBackdropColor(0, 0, 0, 1)
    iconFrame:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
    
    local icon = iconFrame:CreateTexture(nil, "ARTWORK")
    icon:SetPoint("TOPLEFT", 2, -2)
    icon:SetPoint("BOTTOMRIGHT", -2, 2)
    icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
    panel.icon = icon
    
    local spellName = panel:CreateFontString(nil, "OVERLAY", "DFFontNormalLarge")
    spellName:SetPoint("LEFT", iconFrame, "RIGHT", 10, 0)
    spellName:SetPoint("RIGHT", -12, 0)
    spellName:SetJustifyH("LEFT")
    spellName:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    panel.spellName = spellName
    
    -- Divider
    local div1 = panel:CreateTexture(nil, "ARTWORK")
    div1:SetPoint("TOPLEFT", 12, -80)
    div1:SetPoint("TOPRIGHT", -12, -80)
    div1:SetHeight(1)
    div1:SetColorTexture(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    
    -- Binding section
    local bindLabel = panel:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    bindLabel:SetPoint("TOPLEFT", 12, -90)
    bindLabel:SetText(L["Binding:"])
    bindLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    local bindButton = CreateFrame("Button", nil, panel, "BackdropTemplate")
    bindButton:SetPoint("LEFT", bindLabel, "RIGHT", 10, 0)
    bindButton:SetSize(150, 26)
    bindButton:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    bindButton:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    bindButton:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
    
    local bindText = bindButton:CreateFontString(nil, "OVERLAY", "DFFontHighlight")
    bindText:SetPoint("CENTER")
    bindText:SetText(L["Click to bind..."])
    bindText:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    panel.bindText = bindText
    
    bindButton:SetScript("OnEnter", function(self)
        self:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
    end)
    bindButton:SetScript("OnLeave", function(self)
        if not panel.isCapturing then
            self:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
        end
    end)
    -- Register for all mouse buttons so we can capture them
    bindButton:RegisterForClicks("AnyDown")
    bindButton:SetScript("OnClick", function(self, button)
        if panel.isCapturing then
            -- Already capturing - treat this click as the binding
            CC:CaptureBinding("mouse", button)
        else
            -- Not capturing - start capture mode
            CC:StartBindingCapture()
        end
    end)
    bindButton:EnableMouseWheel(true)
    bindButton:SetScript("OnMouseWheel", function(self, delta)
        if panel.isCapturing then
            local scrollKey = delta > 0 and "SCROLLUP" or "SCROLLDOWN"
            CC:CaptureBinding("scroll", scrollKey)
        end
    end)
    panel.bindButton = bindButton
    
    -- Clear binding button
    local clearBindBtn = CreateFrame("Button", nil, panel, "BackdropTemplate")
    clearBindBtn:SetPoint("LEFT", bindButton, "RIGHT", 6, 0)
    clearBindBtn:SetSize(60, 26)
    clearBindBtn:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    clearBindBtn:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    clearBindBtn:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
    local clearIcon = clearBindBtn:CreateTexture(nil, "OVERLAY")
    clearIcon:SetPoint("LEFT", 8, 0)
    clearIcon:SetSize(12, 12)
    clearIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\close")
    clearIcon:SetVertexColor(0.8, 0.5, 0.5)
    local clearText = clearBindBtn:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    clearText:SetPoint("LEFT", clearIcon, "RIGHT", 3, 0)
    clearText:SetText(L["Clear"])
    clearText:SetTextColor(0.8, 0.5, 0.5)
    clearBindBtn:SetScript("OnEnter", function(self)
        self:SetBackdropBorderColor(1, 0.4, 0.4, 1)
    end)
    clearBindBtn:SetScript("OnLeave", function(self)
        self:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
    end)
    clearBindBtn:SetScript("OnClick", function()
        panel.pendingBinding.bindType = nil
        panel.pendingBinding.button = nil
        panel.pendingBinding.key = nil
        panel.pendingBinding.modifiers = ""
        panel.bindText:SetText(L["Click to bind..."])
        panel.bindText:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    end)
    
    -- Mac warning label (always created, only shown on Mac by default)
    local macWarning = panel:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    macWarning:SetPoint("TOPLEFT", bindButton, "BOTTOMLEFT", 0, -2)
    macWarning:SetPoint("RIGHT", clearBindBtn, "RIGHT", 0, 0)
    macWarning:SetJustifyH("LEFT")
    macWarning:SetWordWrap(false)
    macWarning:SetText("|cffff9900" .. L["Note: Cmd + Left Click unavailable on Mac"])
    macWarning:SetTextColor(0.9, 0.6, 0.2)
    if IsMacClient and IsMacClient() then
        macWarning:Show()
    else
        macWarning:Hide()
    end
    panel.macWarning = macWarning
    
    -- Helper to create radio button
    local function CreateRadioButton(parent, text, yOffset, group)
        local radio = CreateFrame("CheckButton", nil, parent, "BackdropTemplate")
        radio:SetSize(16, 16)
        radio:SetBackdrop({
            bgFile = "Interface\\Buttons\\WHITE8x8",
            edgeFile = "Interface\\Buttons\\WHITE8x8",
            edgeSize = 1,
        })
        radio:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
        radio:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
        
        local check = radio:CreateTexture(nil, "OVERLAY")
        check:SetTexture("Interface\\Buttons\\WHITE8x8")
        check:SetVertexColor(themeColor.r, themeColor.g, themeColor.b)
        check:SetPoint("CENTER")
        check:SetSize(8, 8)
        radio:SetCheckedTexture(check)
        
        local label = parent:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
        label:SetPoint("LEFT", radio, "RIGHT", 6, 0)
        label:SetText(text)
        label:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
        
        radio.label = label
        radio.group = group
        
        return radio
    end
    
    -- Frames section (checkboxes)
    local framesLabel = panel:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    framesLabel:SetPoint("TOPLEFT", 12, -125)
    framesLabel:SetText(L["Apply to Frames:"])
    framesLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    -- Subtitle explaining what frames options are for
    local framesSubtitle = panel:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    framesSubtitle:SetPoint("TOPLEFT", framesLabel, "BOTTOMLEFT", 0, -1)
    framesSubtitle:SetWidth(295)
    framesSubtitle:SetJustifyH("LEFT")
    framesSubtitle:SetWordWrap(true)
    framesSubtitle:SetText(L["Works when hovering frames. Action bars work when not hovering."])
    framesSubtitle:SetTextColor(0.5, 0.5, 0.5)
    panel.framesSubtitle = framesSubtitle
    
    -- Helper to create custom themed checkbox with tick mark
    local function CreateCheckbox(parent, text, desc)
        local cb = CreateFrame("CheckButton", nil, parent, "BackdropTemplate")
        cb:SetSize(18, 18)
        cb:SetBackdrop({
            bgFile = "Interface\\Buttons\\WHITE8x8",
            edgeFile = "Interface\\Buttons\\WHITE8x8",
            edgeSize = 1,
        })
        cb:SetBackdropColor(0.1, 0.1, 0.1, 0.9)
        cb:SetBackdropBorderColor(0.4, 0.4, 0.4, 1)
        cb.desc = desc
        
        -- Checkmark texture (using Blizzard's standard checkmark)
        local check = cb:CreateTexture(nil, "OVERLAY")
        check:SetSize(20, 20)
        check:SetPoint("CENTER", 0, 0)
        check:SetTexture("Interface\\Buttons\\UI-CheckBox-Check")
        check:SetVertexColor(themeColor.r, themeColor.g, themeColor.b, 1)
        check:Hide()
        cb.check = check
        
        -- Text label
        local label = cb:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
        label:SetPoint("LEFT", cb, "RIGHT", 6, 0)
        label:SetText(text)
        cb.text = label
        
        -- Internal checked state
        cb.isChecked = false
        
        -- Store external click handler
        cb.externalOnClick = nil
        
        -- Override SetScript to capture OnClick handlers
        local origSetScript = cb.SetScript
        cb.SetScript = function(self, scriptType, handler)
            if scriptType == "OnClick" then
                self.externalOnClick = handler
            else
                origSetScript(self, scriptType, handler)
            end
        end
        
        -- Override GetChecked
        cb.GetChecked = function(self)
            return self.isChecked
        end
        
        -- Override SetChecked to update visuals
        cb.SetChecked = function(self, checked)
            self.isChecked = checked
            if checked then
                self.check:Show()
                self:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
            else
                self.check:Hide()
                self:SetBackdropBorderColor(0.4, 0.4, 0.4, 1)
            end
        end
        
        -- Internal click behavior
        origSetScript(cb, "OnClick", function(self)
            self.isChecked = not self.isChecked
            if self.isChecked then
                self.check:Show()
                self:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
            else
                self.check:Hide()
                self:SetBackdropBorderColor(0.4, 0.4, 0.4, 1)
            end
            PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON)
            -- Call external handler if set
            if self.externalOnClick then
                self:externalOnClick()
            end
        end)
        
        -- Hover effect
        origSetScript(cb, "OnEnter", function(self)
            self:SetBackdropBorderColor(themeColor.r * 1.3, themeColor.g * 1.3, themeColor.b * 1.3, 1)
            GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
            GameTooltip:SetText(text, 1, 1, 1)
            if self.desc then
                GameTooltip:AddLine(self.desc, 0.7, 0.7, 0.7, true)
            end
            GameTooltip:Show()
        end)
        origSetScript(cb, "OnLeave", function(self)
            if self.isChecked then
                self:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
            else
                self:SetBackdropBorderColor(0.4, 0.4, 0.4, 1)
            end
            GameTooltip:Hide()
        end)
        
        return cb
    end
    
    -- DandersFrames checkbox
    local dfFramesCB = CreateCheckbox(panel, FRAME_INFO.dandersFrames.name, FRAME_INFO.dandersFrames.desc)
    dfFramesCB:SetPoint("TOPLEFT", 30, -168)
    dfFramesCB:SetScript("OnClick", function(self)
        panel.pendingBinding.frames = panel.pendingBinding.frames or {}
        panel.pendingBinding.frames.dandersFrames = self:GetChecked()
    end)
    panel.dfFramesCB = dfFramesCB
    
    -- Other Frames checkbox
    local otherFramesCB = CreateCheckbox(panel, FRAME_INFO.otherFrames.name, FRAME_INFO.otherFrames.desc)
    otherFramesCB:SetPoint("TOPLEFT", 30, -190)
    otherFramesCB:SetScript("OnClick", function(self)
        panel.pendingBinding.frames = panel.pendingBinding.frames or {}
        panel.pendingBinding.frames.otherFrames = self:GetChecked()
    end)
    panel.otherFramesCB = otherFramesCB
    
    -- Target Type section (moved up, was below Fallback)
    local targetLabel = panel:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    targetLabel:SetPoint("TOPLEFT", 12, -218)
    targetLabel:SetText(L["Target Type:"])
    targetLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    panel.targetLabel = targetLabel
    
    local targetRadios = {}
    local targetOptions = {
        {key = "all", text = L["Any Target"], desc = TARGET_INFO.all.desc},
        {key = "friendly", text = L["Friendly Only"], desc = TARGET_INFO.friendly.desc},
        {key = "hostile", text = L["Hostile Only"], desc = TARGET_INFO.hostile.desc},
    }
    
    for i, opt in ipairs(targetOptions) do
        local radio = CreateRadioButton(panel, opt.text, 0, "target")
        radio:SetPoint("TOPLEFT", 30, -236 - ((i-1) * 20))
        radio.key = opt.key
        radio.desc = opt.desc
        
        radio:SetScript("OnClick", function(self)
            for _, r in ipairs(targetRadios) do
                r:SetChecked(r == self)
            end
            panel.pendingBinding.targetType = self.key
        end)
        
        radio:SetScript("OnEnter", function(self)
            GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
            GameTooltip:SetText(opt.text, 1, 1, 1)
            GameTooltip:AddLine(opt.desc, 0.7, 0.7, 0.7, true)
            GameTooltip:Show()
        end)
        radio:SetScript("OnLeave", function() GameTooltip:Hide() end)
        
        table.insert(targetRadios, radio)
    end
    panel.targetRadios = targetRadios
    
    -- Combat/Active section (moved up, was below Target Type)
    local combatLabel = panel:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    combatLabel:SetPoint("TOPLEFT", 12, -302)
    combatLabel:SetText(L["Active:"])
    combatLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    panel.combatLabel = combatLabel
    
    local combatRadios = {}
    local combatOptions = {
        {key = "always", text = L["Always"], desc = COMBAT_INFO.always.desc},
        {key = "incombat", text = L["In Combat Only"], desc = COMBAT_INFO.incombat.desc},
        {key = "outofcombat", text = L["Out of Combat Only"], desc = COMBAT_INFO.outofcombat.desc},
    }
    
    for i, opt in ipairs(combatOptions) do
        local radio = CreateRadioButton(panel, opt.text, 0, "combat")
        radio:SetPoint("TOPLEFT", 30, -320 - ((i-1) * 20))
        radio.key = opt.key
        radio.desc = opt.desc
        
        radio:SetScript("OnClick", function(self)
            for _, r in ipairs(combatRadios) do
                r:SetChecked(r == self)
            end
            panel.pendingBinding.combat = self.key
        end)
        
        radio:SetScript("OnEnter", function(self)
            GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
            GameTooltip:SetText(opt.text, 1, 1, 1)
            GameTooltip:AddLine(opt.desc, 0.7, 0.7, 0.7, true)
            GameTooltip:Show()
        end)
        radio:SetScript("OnLeave", function() GameTooltip:Hide() end)
        
        table.insert(combatRadios, radio)
    end
    panel.combatRadios = combatRadios
    
    -- ============================================================
    -- ADVANCED COLLAPSIBLE SECTION
    -- ============================================================
    
    local COLLAPSED_HEIGHT = 502
    local EXPANDED_HEIGHT = 685
    
    -- Advanced header/toggle button
    local advancedToggle = CreateFrame("Button", nil, panel, "BackdropTemplate")
    advancedToggle:SetPoint("TOPLEFT", 12, -385)
    advancedToggle:SetSize(296, 22)
    advancedToggle:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    advancedToggle:SetBackdropColor(C_ELEMENT.r * 0.8, C_ELEMENT.g * 0.8, C_ELEMENT.b * 0.8, 1)
    advancedToggle:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
    
    -- Use icon instead of text arrow
    local advancedArrow = advancedToggle:CreateTexture(nil, "OVERLAY")
    advancedArrow:SetPoint("LEFT", 6, 0)
    advancedArrow:SetSize(12, 12)
    advancedArrow:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\chevron_right")
    advancedArrow:SetVertexColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    local advancedText = advancedToggle:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    advancedText:SetPoint("LEFT", advancedArrow, "RIGHT", 4, 0)
    advancedText:SetText(L["Advanced"])
    advancedText:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    advancedToggle:SetScript("OnEnter", function(self)
        self:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
    end)
    advancedToggle:SetScript("OnLeave", function(self)
        self:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
    end)
    
    panel.advancedToggle = advancedToggle
    panel.advancedArrow = advancedArrow
    panel.advancedExpanded = false
    
    -- Advanced content container (hidden by default)
    local advancedContent = CreateFrame("Frame", nil, panel)
    advancedContent:SetPoint("TOPLEFT", advancedToggle, "BOTTOMLEFT", 0, -8)
    advancedContent:SetSize(296, 140)
    advancedContent:Hide()
    panel.advancedContent = advancedContent
    
    -- Fallback section (inside advanced content)
    local fallbackLabel = advancedContent:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    fallbackLabel:SetPoint("TOPLEFT", 0, 0)
    fallbackLabel:SetText(L["Targeting Fallback:"])
    fallbackLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    panel.fallbackLabel = fallbackLabel
    
    -- Subtitle explaining what fallback is for
    local fallbackSubtitle = advancedContent:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    fallbackSubtitle:SetPoint("TOPLEFT", fallbackLabel, "BOTTOMLEFT", 0, -1)
    fallbackSubtitle:SetWidth(280)
    fallbackSubtitle:SetJustifyH("LEFT")
    fallbackSubtitle:SetWordWrap(true)
    fallbackSubtitle:SetText(format(L["For nameplates & world units. %sDoes not work with action bar binds.%s"], "|cffff3333", "|r"))
    fallbackSubtitle:SetTextColor(0.5, 0.5, 0.5)
    panel.fallbackSubtitle = fallbackSubtitle
    
    -- Mouseover checkbox
    local mouseoverCB = CreateCheckbox(advancedContent, FALLBACK_INFO.mouseover.name, FALLBACK_INFO.mouseover.desc)
    mouseoverCB:SetPoint("TOPLEFT", 18, -38)
    mouseoverCB:SetScript("OnClick", function(self)
        panel.pendingBinding.fallback = panel.pendingBinding.fallback or {}
        panel.pendingBinding.fallback.mouseover = self:GetChecked()
    end)
    panel.mouseoverCB = mouseoverCB
    
    -- Target checkbox
    local targetFallbackCB = CreateCheckbox(advancedContent, FALLBACK_INFO.target.name, FALLBACK_INFO.target.desc)
    targetFallbackCB:SetPoint("TOPLEFT", 18, -60)
    targetFallbackCB:SetScript("OnClick", function(self)
        panel.pendingBinding.fallback = panel.pendingBinding.fallback or {}
        panel.pendingBinding.fallback.target = self:GetChecked()
    end)
    panel.targetFallbackCB = targetFallbackCB
    
    -- Self checkbox
    local selfCB = CreateCheckbox(advancedContent, FALLBACK_INFO.selfCast.name, FALLBACK_INFO.selfCast.desc)
    selfCB:SetPoint("TOPLEFT", 18, -82)
    selfCB:SetScript("OnClick", function(self)
        panel.pendingBinding.fallback = panel.pendingBinding.fallback or {}
        panel.pendingBinding.fallback.selfCast = self:GetChecked()
    end)
    panel.selfCB = selfCB

    -- Macro Options section header
    local macroOptionsLabel = advancedContent:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    macroOptionsLabel:SetPoint("TOPLEFT", 0, -108)
    macroOptionsLabel:SetText(L["Macro Options:"])
    macroOptionsLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    panel.macroOptionsLabel = macroOptionsLabel

    -- Cancel Targeting checkbox (stopSpellTarget)
    local stopSpellTargetCB = CreateCheckbox(advancedContent, FALLBACK_INFO.stopSpellTarget.name, FALLBACK_INFO.stopSpellTarget.desc)
    stopSpellTargetCB:SetPoint("TOPLEFT", 18, -128)
    stopSpellTargetCB:SetScript("OnClick", function(self)
        panel.pendingBinding.fallback = panel.pendingBinding.fallback or {}
        panel.pendingBinding.fallback.stopSpellTarget = self:GetChecked()
    end)
    panel.stopSpellTargetCB = stopSpellTargetCB

    -- Priority slider (inside advanced content)
    local priorityLabel = advancedContent:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    priorityLabel:SetPoint("TOPLEFT", 0, -158)
    priorityLabel:SetText(L["Priority:"])
    priorityLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    panel.priorityLabel = priorityLabel
    
    local priorityValue = advancedContent:CreateFontString(nil, "OVERLAY", "DFFontHighlight")
    priorityValue:SetPoint("LEFT", priorityLabel, "RIGHT", 5, 0)
    priorityValue:SetText("5")
    priorityValue:SetTextColor(themeColor.r, themeColor.g, themeColor.b)
    panel.priorityValue = priorityValue
    
    local prioritySlider = CreateFrame("Slider", nil, advancedContent, "BackdropTemplate")
    prioritySlider:SetPoint("TOPLEFT", 68, -155)
    prioritySlider:SetSize(200, 16)
    prioritySlider:SetOrientation("HORIZONTAL")
    prioritySlider:SetMinMaxValues(1, 10)
    prioritySlider:SetValueStep(1)
    prioritySlider:SetObeyStepOnDrag(true)
    prioritySlider:SetValue(6)  -- Inverted: slider 6 = priority 5
    prioritySlider:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    prioritySlider:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    prioritySlider:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
    
    local sliderThumb = prioritySlider:CreateTexture(nil, "OVERLAY")
    sliderThumb:SetSize(12, 16)
    sliderThumb:SetColorTexture(themeColor.r, themeColor.g, themeColor.b, 1)
    prioritySlider:SetThumbTexture(sliderThumb)
    
    -- Invert slider: left = 10 (low), right = 1 (high)
    prioritySlider:SetScript("OnValueChanged", function(self, value)
        local sliderValue = math.floor(value + 0.5)
        local priority = 11 - sliderValue  -- Invert: slider 1 = priority 10, slider 10 = priority 1
        priorityValue:SetText(tostring(priority))
        panel.pendingBinding.priority = priority
    end)
    
    -- Priority hint labels (10 = Low on left, 1 = High on right)
    local lowLabel = advancedContent:CreateFontString(nil, "OVERLAY", "DFFontNormalSmall")
    lowLabel:SetPoint("TOPLEFT", prioritySlider, "BOTTOMLEFT", 0, -2)
    lowLabel:SetText(L["10 = Low"])
    lowLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    local highLabel = advancedContent:CreateFontString(nil, "OVERLAY", "DFFontNormalSmall")
    highLabel:SetPoint("TOPRIGHT", prioritySlider, "BOTTOMRIGHT", 0, -2)
    highLabel:SetText(L["1 = High"])
    highLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    panel.prioritySlider = prioritySlider
    
    -- ============================================================
    -- GLOBAL KEYBIND SECTION (for macros/items only, positioned above Active)
    -- ============================================================
    
    -- Global Keybind heading
    local globalBindLabel = panel:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    globalBindLabel:SetPoint("TOPLEFT", 12, -302)  -- Will be repositioned dynamically
    globalBindLabel:SetText(L["Global Keybind:"])
    globalBindLabel:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    globalBindLabel:Hide()
    panel.globalBindLabel = globalBindLabel
    
    -- Description for Global Keybind (below heading)
    local globalBindDesc = panel:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    globalBindDesc:SetPoint("TOPLEFT", 12, -318)  -- Will be repositioned dynamically
    globalBindDesc:SetWidth(280)
    globalBindDesc:SetJustifyH("LEFT")
    globalBindDesc:SetWordWrap(true)
    globalBindDesc:SetText(L["For items/macros that need @cursor, @mouseover, etc. Consumes the keybind and prevents action bar use."])
    globalBindDesc:SetTextColor(0.5, 0.5, 0.5)
    globalBindDesc:Hide()
    panel.globalBindDesc = globalBindDesc
    
    -- Global Keybind checkbox (below description)
    local globalBindCB = CreateCheckbox(panel, L["Enable"], L["Makes this binding work everywhere, consuming the keybind."])
    globalBindCB:SetPoint("TOPLEFT", 30, -350)  -- Will be repositioned dynamically
    globalBindCB:SetScript("OnClick", function(self)
        panel.pendingBinding.useGlobalBind = self:GetChecked()
    end)
    globalBindCB:Hide()  -- Hidden by default, shown only for macros/items
    panel.globalBindCB = globalBindCB
    
    -- Toggle function for Advanced section
    local function ToggleAdvanced()
        panel.advancedExpanded = not panel.advancedExpanded
        
        -- Determine if this is a macro/item binding
        local isMacroOrItem = panel.pendingBinding and 
            (panel.pendingBinding.actionType == CC.ACTION_TYPES.MACRO or 
             panel.pendingBinding.actionType == CC.ACTION_TYPES.ITEM or
             panel.pendingBinding.macroId)
        
        -- Use appropriate heights
        local collapsedHeight = isMacroOrItem and 475 or COLLAPSED_HEIGHT
        local expandedHeight = isMacroOrItem and 540 or EXPANDED_HEIGHT
        
        if panel.advancedExpanded then
            advancedArrow:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\expand_more")
            advancedContent:Show()
            panel:SetHeight(expandedHeight)
        else
            advancedArrow:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\chevron_right")
            advancedContent:Hide()
            panel:SetHeight(collapsedHeight)
        end
    end
    
    advancedToggle:SetScript("OnClick", ToggleAdvanced)
    panel.ToggleAdvanced = ToggleAdvanced
    
    -- Start collapsed
    panel:SetHeight(COLLAPSED_HEIGHT)
    
    -- Bottom buttons
    local saveBtn = CreateFrame("Button", nil, panel, "BackdropTemplate")
    saveBtn:SetSize(90, 28)
    saveBtn:SetPoint("BOTTOMRIGHT", -12, 12)
    saveBtn:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    saveBtn:SetBackdropColor(themeColor.r * 0.4, themeColor.g * 0.4, themeColor.b * 0.4, 1)
    saveBtn:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
    local saveIcon = saveBtn:CreateTexture(nil, "OVERLAY")
    saveIcon:SetPoint("LEFT", 14, 0)
    saveIcon:SetSize(14, 14)
    saveIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\save")
    saveIcon:SetVertexColor(1, 1, 1)
    local saveText = saveBtn:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    saveText:SetPoint("LEFT", saveIcon, "RIGHT", 4, 0)
    saveText:SetText(L["Save"])
    saveText:SetTextColor(1, 1, 1)
    saveBtn:SetScript("OnEnter", function(self)
        self:SetBackdropColor(themeColor.r * 0.6, themeColor.g * 0.6, themeColor.b * 0.6, 1)
    end)
    saveBtn:SetScript("OnLeave", function(self)
        self:SetBackdropColor(themeColor.r * 0.4, themeColor.g * 0.4, themeColor.b * 0.4, 1)
    end)
    saveBtn:SetScript("OnClick", function()
        CC:SaveEditBindingPanel()
    end)

    local cancelBtn = CreateFrame("Button", nil, panel, "BackdropTemplate")
    cancelBtn:SetSize(90, 28)
    cancelBtn:SetPoint("RIGHT", saveBtn, "LEFT", -8, 0)
    cancelBtn:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    cancelBtn:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    cancelBtn:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
    local cancelText = cancelBtn:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    cancelText:SetPoint("CENTER")
    cancelText:SetText(L["Cancel"])
    cancelText:SetTextColor(0.8, 0.8, 0.8)
    cancelBtn:SetScript("OnEnter", function(self)
        self:SetBackdropBorderColor(0.8, 0.4, 0.4, 1)
    end)
    cancelBtn:SetScript("OnLeave", function(self)
        self:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
    end)
    cancelBtn:SetScript("OnClick", function()
        CC:HideEditBindingPanel()
    end)

    -- Delete button (only shown when editing existing binding)
    local deleteBtn = CreateFrame("Button", nil, panel, "BackdropTemplate")
    deleteBtn:SetSize(80, 28)
    deleteBtn:SetPoint("BOTTOMLEFT", 12, 12)
    deleteBtn:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    deleteBtn:SetBackdropColor(0.4, 0.1, 0.1, 1)
    deleteBtn:SetBackdropBorderColor(0.6, 0.2, 0.2, 1)
    local deleteIcon = deleteBtn:CreateTexture(nil, "OVERLAY")
    deleteIcon:SetPoint("LEFT", 12, 0)
    deleteIcon:SetSize(14, 14)
    deleteIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\delete")
    deleteIcon:SetVertexColor(1, 0.5, 0.5)
    local deleteText = deleteBtn:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    deleteText:SetPoint("LEFT", deleteIcon, "RIGHT", 4, 0)
    deleteText:SetText(L["Delete"])
    deleteText:SetTextColor(1, 0.5, 0.5)
    deleteBtn:SetScript("OnEnter", function(self)
        self:SetBackdropColor(0.6, 0.15, 0.15, 1)
        self:SetBackdropBorderColor(1, 0.3, 0.3, 1)
    end)
    deleteBtn:SetScript("OnLeave", function(self)
        self:SetBackdropColor(0.4, 0.1, 0.1, 1)
        self:SetBackdropBorderColor(0.6, 0.2, 0.2, 1)
    end)
    deleteBtn:SetScript("OnClick", function()
        CC:DeleteFromEditBindingPanel()
    end)
    panel.deleteBtn = deleteBtn
    
    -- Keyboard input capture for binding button
    panel:SetScript("OnKeyDown", function(self, key)
        if not self.isCapturing then return end
        
        if key == "ESCAPE" then
            CC:StopBindingCapture()
            return
        end
        
        -- Check if it's a modifier key - these shouldn't be captured as the main key
        if key == "LSHIFT" or key == "RSHIFT" or key == "LCTRL" or key == "RCTRL" or key == "LALT" or key == "RALT" or key == "LMETA" or key == "RMETA" then
            return
        end
        
        -- Accept any key that WoW reports - this supports international keyboards
        -- Keys like ^ on German keyboards, ñ on Spanish, etc.
        if key and key ~= "" then
            CC:CaptureBinding("key", key)
        end
    end)
    
    panel:SetScript("OnMouseDown", function(self, button)
        if not self.isCapturing then return end
        
        if button == "LeftButton" or button == "RightButton" or button == "MiddleButton" or button:match("^Button%d+$") then
            CC:CaptureBinding("mouse", button)
        end
    end)
    
    panel:SetScript("OnMouseWheel", function(self, delta)
        if not self.isCapturing then return end
        
        local scrollKey = delta > 0 and "SCROLLUP" or "SCROLLDOWN"
        CC:CaptureBinding("scroll", scrollKey)
    end)
    
    self.editBindingPanel = panel
end

function CC:StartBindingCapture()
    local panel = self.editBindingPanel
    if not panel then return end
    
    panel.isCapturing = true
    panel:EnableKeyboard(true)
    panel:EnableMouseWheel(true)
    panel.bindButton:SetBackdropBorderColor(0.2, 0.8, 0.4, 1)
    panel.bindText:SetText(L["Press key/click/scroll..."])
    panel.bindText:SetTextColor(0.2, 0.8, 0.4)
    
    -- Update modifier display during capture
    panel.captureUpdateTimer = C_Timer.NewTicker(0.05, function()
        if not panel.isCapturing then return end
        local mods = ""
        if IsShiftKeyDown() then mods = mods .. "Shift + " end
        if IsControlKeyDown() then mods = mods .. "Ctrl + " end
        if IsAltKeyDown() then mods = mods .. "Alt + " end
        if IsMetaKeyDown() then mods = mods .. "Cmd + " end
        if mods ~= "" then
            panel.bindText:SetText(mods .. "...")
        else
            panel.bindText:SetText(L["Press key/click/scroll..."])
        end
    end)
end

function CC:StopBindingCapture()
    local panel = self.editBindingPanel
    if not panel then return end
    
    panel.isCapturing = false
    panel:EnableKeyboard(false)
    panel.bindButton:SetBackdropBorderColor(0.25, 0.25, 0.25, 1)
    
    if panel.captureUpdateTimer then
        panel.captureUpdateTimer:Cancel()
        panel.captureUpdateTimer = nil
    end
    
    -- Restore binding text
    CC:UpdateBindingButtonText()
end

function CC:CaptureBinding(bindType, key)
    local panel = self.editBindingPanel
    if not panel then return end
    
    -- Build modifier string
    local mods = ""
    if IsShiftKeyDown() then mods = mods .. "shift-" end
    if IsControlKeyDown() then mods = mods .. "ctrl-" end
    if IsAltKeyDown() then mods = mods .. "alt-" end
    if IsMetaKeyDown() then mods = mods .. "meta-" end
    
    panel.pendingBinding.bindType = bindType
    panel.pendingBinding.modifiers = mods
    
    if bindType == "mouse" then
        panel.pendingBinding.button = key
        panel.pendingBinding.key = nil
        
        -- Warn Mac users about Command+Left Click limitation (right click works fine)
        if mods:find("meta") and key == "LeftButton" then
            CC:ShowMacMetaClickWarning()
        end
    else
        panel.pendingBinding.key = key
        panel.pendingBinding.button = nil
    end
    
    CC:StopBindingCapture()
end

-- Show warning about Mac Command+Left Click not working
function CC:ShowMacMetaClickWarning()
    StaticPopupDialogs["DF_MAC_META_CLICK_WARNING"] = {
        text = "|cffff9900Mac Limitation|r\n\n" ..
               "Command + Left Click bindings do not work on macOS. " ..
               "This is a World of Warcraft client limitation, not an addon bug.\n\n" ..
               "The binding will be saved, but it will not trigger in-game.\n\n" ..
               "|cff88ff88Recommendation:|r Use |cffffffffOption (Alt)|r or |cffffffffControl|r instead of Command for left click modifiers.",
        button1 = "OK",
        timeout = 0,
        whileDead = true,
        hideOnEscape = true,
        preferredIndex = 3,
    }
    ShowPopupOnTop("DF_MAC_META_CLICK_WARNING")
end

function CC:UpdateBindingButtonText()
    local panel = self.editBindingPanel
    if not panel then return end
    
    local binding = panel.pendingBinding
    if binding.bindType and (binding.button or binding.key) then
        local text = CC:GetBindingKeyText(binding)
        panel.bindText:SetText(text)
        panel.bindText:SetTextColor(0.9, 0.9, 0.9)
    else
        panel.bindText:SetText(L["Click to bind..."])
        panel.bindText:SetTextColor(0.5, 0.5, 0.5)
    end
end

function CC:ShowEditBindingPanel(spellData, existingBinding, existingIndex)
    if not self.editBindingPanel then
        self:CreateEditBindingPanel()
    end
    
    local panel = self.editBindingPanel
    
    -- Store context
    panel.spellData = spellData
    panel.existingIndex = existingIndex
    panel.isEditing = existingIndex ~= nil
    
    -- Initialize pending binding data
    if existingBinding then
        panel.pendingBinding = CopyTable(existingBinding)
        -- Ensure frames and fallback exist
        panel.pendingBinding.frames = panel.pendingBinding.frames or { dandersFrames = true, otherFrames = true }
        panel.pendingBinding.fallback = panel.pendingBinding.fallback or { mouseover = false, target = false, selfCast = false }
    else
        panel.pendingBinding = {
            enabled = true,
            bindType = nil,
            button = nil,
            key = nil,
            modifiers = "",
            frames = { dandersFrames = true, otherFrames = true },
            fallback = { mouseover = false, target = false, selfCast = false },
            combat = DEFAULT_BINDING_COMBAT,
            actionType = spellData.actionType or self.ACTION_TYPES.SPELL,
            spellId = spellData.spellId,
            spellName = spellData.spellName or spellData.name,
            priority = 5,  -- Default priority (1=highest, 10=lowest)
        }
        
        if spellData.isMacro then
            panel.pendingBinding.actionType = self.ACTION_TYPES.MACRO
            panel.pendingBinding.macroId = spellData.macroId
            panel.pendingBinding.macroName = spellData.name
        elseif spellData.isItem then
            panel.pendingBinding.actionType = self.ACTION_TYPES.ITEM
            panel.pendingBinding.itemType = spellData.itemType
            if spellData.itemType == "slot" then
                panel.pendingBinding.itemSlot = spellData.itemSlot
                panel.pendingBinding.itemName = spellData.slotName or spellData.name
            else
                panel.pendingBinding.itemId = spellData.itemId
                panel.pendingBinding.itemName = spellData.name
            end
        end
    end
    
    -- Update title
    if panel.isEditing then
        panel.title:SetText(L["Edit Binding"])
    else
        panel.title:SetText(L["New Binding"])
    end
    
    -- Update spell info - handle icons for spells, macros, items, and actions
    local iconTexture = spellData.icon
    if not iconTexture and existingBinding then
        local actionType = existingBinding.actionType
        if actionType == "target" then
            iconTexture = "Interface\\CURSOR\\Crosshairs"
        elseif actionType == "menu" then
            iconTexture = "Interface\\Buttons\\UI-GuildButton-OfficerNote-Up"
        elseif actionType == "focus" then
            iconTexture = "Interface\\Icons\\Ability_Hunter_MasterMarksman"
        elseif actionType == "assist" then
            iconTexture = "Interface\\Icons\\Ability_Hunter_SniperShot"
        elseif actionType == CC.ACTION_TYPES.ITEM then
            -- Item binding
            if existingBinding.itemType == "slot" and existingBinding.itemSlot then
                local itemInfo = CC:GetSlotItemInfo(existingBinding.itemSlot)
                if itemInfo and itemInfo.icon then
                    iconTexture = itemInfo.icon
                end
            elseif existingBinding.itemId then
                local itemInfo = CC:GetItemInfoById(existingBinding.itemId)
                if itemInfo and itemInfo.icon then
                    iconTexture = itemInfo.icon
                end
            end
        elseif existingBinding.spellId then
            iconTexture = C_Spell.GetSpellTexture(existingBinding.spellId)
        elseif existingBinding.macroId then
            -- Look up macro icon - try auto-detect first
            local macro = CC:GetMacroById(existingBinding.macroId)
            if macro then
                iconTexture = CC:GetIconFromMacroBody(macro.body)
                if not iconTexture and macro.icon and type(macro.icon) == "number" and macro.icon > 0 then
                    iconTexture = macro.icon
                end
            end
        end
    end
    if not iconTexture then
        iconTexture = "Interface\\Icons\\INV_Misc_QuestionMark"
    end
    panel.icon:SetTexture(iconTexture)
    
    -- Get display name (shows current override for talent-modified spells)
    local displayName = spellData.name or spellData.spellName
    if spellData.spellId and not spellData.isMacro and not spellData.isItem then
        displayName = GetSpellDisplayInfo(spellData.spellId, displayName) or displayName
    elseif existingBinding and existingBinding.spellId then
        displayName = GetSpellDisplayInfo(existingBinding.spellId, existingBinding.spellName) or displayName
    end
    panel.spellName:SetText(displayName or "Unknown")
    
    -- Update binding button
    CC:UpdateBindingButtonText()
    
    -- Check if this is a macro or item binding (they handle their own targeting)
    local actionType = panel.pendingBinding.actionType
    local isMacro = (actionType == CC.ACTION_TYPES.MACRO)
    local isItem = (actionType == CC.ACTION_TYPES.ITEM)
    local hideTargeting = isMacro or isItem
    
    -- Update frames checkboxes (always shown)
    local frames = panel.pendingBinding.frames or { dandersFrames = true, otherFrames = true }
    panel.dfFramesCB:SetChecked(frames.dandersFrames)
    panel.otherFramesCB:SetChecked(frames.otherFrames)
    
    -- Check if this binding has advanced options set (should auto-expand)
    local fallback = panel.pendingBinding.fallback or { mouseover = false, target = false, selfCast = false }
    local hasAdvancedOptions = fallback.mouseover or fallback.target or fallback.selfCast or fallback.stopSpellTarget
    local currentPriority = panel.pendingBinding.priority or 5
    if currentPriority ~= 5 then
        hasAdvancedOptions = true
    end
    
    -- Show/hide and initialize Advanced section based on macro/item status
    -- Macros and items handle their own targeting logic, so hide targeting options for them
    -- BUT still show Advanced section for priority control and global bind option
    if hideTargeting then
        -- Show Advanced toggle for macros/items (just with fallback hidden)
        if panel.advancedToggle then
            panel.advancedToggle:Show()
        end
        
        -- Hide fallback section within Advanced (macros handle their own targeting)
        if panel.fallbackLabel then panel.fallbackLabel:Hide() end
        if panel.fallbackSubtitle then panel.fallbackSubtitle:Hide() end
        if panel.mouseoverCB then panel.mouseoverCB:Hide() end
        if panel.targetFallbackCB then panel.targetFallbackCB:Hide() end
        if panel.selfCB then panel.selfCB:Hide() end
        if panel.macroOptionsLabel then panel.macroOptionsLabel:Hide() end
        if panel.stopSpellTargetCB then panel.stopSpellTargetCB:Hide() end
        
        -- Show Global Keybind section for macros/items (above Active section)
        -- Layout: Global Keybind: (heading) -> description -> checkbox
        if panel.globalBindLabel then
            panel.globalBindLabel:Show()
            panel.globalBindLabel:ClearAllPoints()
            panel.globalBindLabel:SetPoint("TOPLEFT", 12, -218)  -- Same Y as where Active would be for spells
        end
        if panel.globalBindDesc then
            panel.globalBindDesc:Show()
            panel.globalBindDesc:ClearAllPoints()
            panel.globalBindDesc:SetPoint("TOPLEFT", 12, -234)  -- Below heading
        end
        if panel.globalBindCB then
            panel.globalBindCB:Show()
            panel.globalBindCB:SetChecked(panel.pendingBinding.useGlobalBind == true)
            panel.globalBindCB:ClearAllPoints()
            panel.globalBindCB:SetPoint("TOPLEFT", 30, -270)  -- Below description
        end
        
        -- Move priority slider up since fallback is hidden
        if panel.priorityLabel then
            panel.priorityLabel:ClearAllPoints()
            panel.priorityLabel:SetPoint("TOPLEFT", panel.advancedContent, "TOPLEFT", 0, -4)
        end
        if panel.prioritySlider then
            panel.prioritySlider:ClearAllPoints()
            panel.prioritySlider:SetPoint("TOPLEFT", panel.advancedContent, "TOPLEFT", 68, -1)
        end
        
        -- Auto-expand Advanced if binding has non-default priority
        local currentPriority = panel.pendingBinding.priority or DEFAULT_PRIORITY
        if currentPriority ~= DEFAULT_PRIORITY and not panel.advancedExpanded then
            panel.advancedExpanded = true
            if panel.advancedArrow then
                panel.advancedArrow:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\expand_more")
            end
            if panel.advancedContent then
                panel.advancedContent:Show()
            end
        end
    else
        -- Show Advanced toggle for spells
        if panel.advancedToggle then
            panel.advancedToggle:Show()
        end
        
        -- Show fallback section for spells
        if panel.fallbackLabel then panel.fallbackLabel:Show() end
        if panel.fallbackSubtitle then panel.fallbackSubtitle:Show() end
        if panel.mouseoverCB then panel.mouseoverCB:Show() end
        if panel.targetFallbackCB then panel.targetFallbackCB:Show() end
        if panel.selfCB then panel.selfCB:Show() end
        if panel.macroOptionsLabel then panel.macroOptionsLabel:Show() end
        if panel.stopSpellTargetCB then panel.stopSpellTargetCB:Show() end
        
        -- Hide Global Keybind section for spells (they use fallback options instead)
        if panel.globalBindLabel then
            panel.globalBindLabel:Hide()
        end
        if panel.globalBindCB then
            panel.globalBindCB:Hide()
        end
        if panel.globalBindDesc then
            panel.globalBindDesc:Hide()
        end
        
        -- Reset priority slider position for spells
        if panel.priorityLabel then
            panel.priorityLabel:ClearAllPoints()
            panel.priorityLabel:SetPoint("TOPLEFT", panel.advancedContent, "TOPLEFT", 0, -158)
        end
        if panel.prioritySlider then
            panel.prioritySlider:ClearAllPoints()
            panel.prioritySlider:SetPoint("TOPLEFT", panel.advancedContent, "TOPLEFT", 68, -155)
        end
        
        -- Auto-expand if binding has advanced options
        if hasAdvancedOptions and not panel.advancedExpanded then
            panel.advancedExpanded = true
            if panel.advancedArrow then
                panel.advancedArrow:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\expand_more")
            end
            if panel.advancedContent then
                panel.advancedContent:Show()
            end
        elseif not hasAdvancedOptions and panel.advancedExpanded then
            -- Collapse if no advanced options
            panel.advancedExpanded = false
            if panel.advancedArrow then
                panel.advancedArrow:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\chevron_right")
            end
            if panel.advancedContent then
                panel.advancedContent:Hide()
            end
        end
    end
    
    -- Hide target type for macros/items (they use their own [help]/[harm] conditions)
    panel.targetLabel:SetShown(not hideTargeting)
    for _, radio in ipairs(panel.targetRadios) do
        radio:SetShown(not hideTargeting)
        if radio.label then
            radio.label:SetShown(not hideTargeting)
        end
    end
    
    -- Reposition combat/active section and advanced toggle based on whether target type is shown
    -- Target Type takes up about 80px (-218 to -296), so when hidden, move things up
    if hideTargeting then
        -- For macros/items: Global Keybind section goes where Target Type was
        -- Layout: Global Keybind (-218) -> Active (-295) -> Advanced (-380)
        
        -- Move Active section down to make room for Global Keybind section above it
        panel.combatLabel:ClearAllPoints()
        panel.combatLabel:SetPoint("TOPLEFT", 12, -295)
        
        -- Move combat radios down
        for i, radio in ipairs(panel.combatRadios) do
            radio:ClearAllPoints()
            radio:SetPoint("TOPLEFT", 30, -313 - ((i-1) * 20))
        end
        
        -- Move advanced toggle below Active section
        panel.advancedToggle:ClearAllPoints()
        panel.advancedToggle:SetPoint("TOPLEFT", 12, -380)
    else
        -- Restore normal positions for spells
        panel.combatLabel:ClearAllPoints()
        panel.combatLabel:SetPoint("TOPLEFT", 12, -302)
        
        for i, radio in ipairs(panel.combatRadios) do
            radio:ClearAllPoints()
            radio:SetPoint("TOPLEFT", 30, -320 - ((i-1) * 20))
        end
        
        panel.advancedToggle:ClearAllPoints()
        panel.advancedToggle:SetPoint("TOPLEFT", 12, -385)
    end
    
    -- Adjust panel height based on macro/item vs spell, and Advanced expanded state
    local SPELL_COLLAPSED_HEIGHT = 502
    local SPELL_EXPANDED_HEIGHT = 685
    local MACRO_COLLAPSED_HEIGHT = 475  -- With Global Keybind section above Active
    local MACRO_EXPANDED_HEIGHT = 540   -- With Advanced expanded (just priority slider)
    
    if hideTargeting then
        -- For macros/items: no target type section
        if panel.advancedExpanded then
            panel:SetHeight(MACRO_EXPANDED_HEIGHT)
        else
            panel:SetHeight(MACRO_COLLAPSED_HEIGHT)
        end
    elseif panel.advancedExpanded then
        panel:SetHeight(SPELL_EXPANDED_HEIGHT)
    else
        panel:SetHeight(SPELL_COLLAPSED_HEIGHT)
    end
    
    -- Update priority slider (inverted: slider value = 11 - priority)
    local sliderValue = 11 - currentPriority  -- Invert for display
    panel.prioritySlider:SetValue(sliderValue)
    panel.priorityValue:SetText(tostring(currentPriority))
    
    -- Update fallback checkboxes (only if not a macro)
    if not isMacro then
        panel.mouseoverCB:SetChecked(fallback.mouseover == true)
        panel.targetFallbackCB:SetChecked(fallback.target == true)
        panel.selfCB:SetChecked(fallback.selfCast == true)
        panel.stopSpellTargetCB:SetChecked(fallback.stopSpellTarget == true)
    end
    
    -- Update target type radios (only if not a macro)
    if not isMacro then
        local currentTargetType = panel.pendingBinding.targetType or DEFAULT_TARGET_TYPE
        for _, radio in ipairs(panel.targetRadios) do
            radio:SetChecked(radio.key == currentTargetType)
        end
    end
    
    -- Update combat radios
    local currentCombat = panel.pendingBinding.combat or DEFAULT_BINDING_COMBAT
    for _, radio in ipairs(panel.combatRadios) do
        radio:SetChecked(radio.key == currentCombat)
    end
    
    -- Show/hide delete button based on editing mode
    panel.deleteBtn:SetShown(panel.isEditing)
    
    -- Position centered on click cast UI
    panel:ClearAllPoints()
    if self.clickCastUIFrame then
        panel:SetPoint("CENTER", self.clickCastUIFrame, "CENTER", 0, 0)
    else
        panel:SetPoint("CENTER", UIParent, "CENTER", 0, 0)
    end
    
    panel:Show()
    panel:Raise()
end

function CC:HideEditBindingPanel()
    if self.editBindingPanel then
        CC:StopBindingCapture()
        self.editBindingPanel:Hide()
        self.editBindingPanel.spellData = nil
        self.editBindingPanel.existingIndex = nil
        self.editBindingPanel.pendingBinding = nil
    end
end

function CC:SaveEditBindingPanel()
    local panel = self.editBindingPanel
    if not panel or not panel.pendingBinding then return end
    
    local binding = panel.pendingBinding
    
    -- Validate that we have a binding key
    if not binding.bindType or (not binding.button and not binding.key) then
        print("|cffff6666DandersFrames:|r Please set a binding key first.")
        return
    end
    
    -- Multiple bindings on same key allowed for fallback functionality
    self:FinalizeSaveBinding()
end

function CC:FinalizeSaveBinding()
    local panel = self.editBindingPanel
    if not panel or not panel.pendingBinding then return end
    
    local binding = panel.pendingBinding
    
    -- Macros handle their own targeting, so force no fallbacks for macro bindings
    if binding.actionType == self.ACTION_TYPES.MACRO or binding.actionType == "macro" then
        binding.fallback = {
            mouseover = false,
            target = false,
            selfCast = false,
        }
    end
    
    -- Check for duplicate binding (exclude self when editing)
    local excludeIndex = panel.isEditing and panel.existingIndex or nil
    local duplicateIndex = self:FindDuplicateBinding(binding, excludeIndex)
    if duplicateIndex then
        print("|cffff9900DandersFrames:|r That binding already exists.")
        return
    end
    
    -- Check for key conflicts (same key combo, different action)
    local conflicts = self:FindKeyConflicts(binding, excludeIndex)
    if #conflicts > 0 then
        -- Build conflict description
        local conflictDesc = ""
        for i, conflict in ipairs(conflicts) do
            local existingBinding = conflict.binding
            local actionName = self:GetBindingActionText(existingBinding) or "Unknown"
            if i > 1 then conflictDesc = conflictDesc .. "\n" end
            conflictDesc = conflictDesc .. "• " .. actionName
            if i >= 3 and #conflicts > 3 then
                conflictDesc = conflictDesc .. "\n• ... and " .. (#conflicts - 3) .. " more"
                break
            end
        end
        
        local keyText = self:GetBindingKeyText(binding)
        
        -- Show warning popup
        StaticPopupDialogs["DF_KEY_CONFLICT_WARNING"] = {
            text = "|cffff9900Warning:|r " .. keyText .. " is already bound to:\n\n" .. conflictDesc .. "\n\nMultiple bindings on the same key may not work as expected. Save anyway?",
            button1 = "Save Anyway",
            button2 = "Cancel",
            OnAccept = function()
                CC:CommitBindingSave()
            end,
            timeout = 0,
            whileDead = true,
            hideOnEscape = true,
            preferredIndex = 3,
        }
        ShowPopupOnTop("DF_KEY_CONFLICT_WARNING")
        return
    end
    
    -- No conflicts, save directly
    self:CommitBindingSave()
end

-- Actually commit the binding save (called after conflict check passes or user confirms)
function CC:CommitBindingSave()
    local panel = self.editBindingPanel
    if not panel or not panel.pendingBinding then return end
    
    local binding = panel.pendingBinding
    
    if panel.isEditing then
        -- Update existing binding
        self.db.bindings[panel.existingIndex] = binding
    else
        -- Add new binding
        table.insert(self.db.bindings, binding)
    end
    
    self:HideEditBindingPanel()
    self:UpdateBlizzardFrameRegistration()
    self:ApplyBindings()
    self:RefreshActiveBindings()
    self:RefreshSpellGrid(true)  -- Skip scroll reset to maintain position
end

function CC:DeleteFromEditBindingPanel()
    local panel = self.editBindingPanel
    if not panel or not panel.isEditing then return end
    
    local binding = self.db.bindings[panel.existingIndex]
    if not binding then return end
    
    StaticPopupDialogs["DF_EDITPANEL_CONFIRM_DELETE"] = {
        text = "Delete binding for " .. self:GetBindingKeyText(binding) .. "?",
        button1 = "Yes",
        button2 = "No",
        OnAccept = function()
            table.remove(CC.db.bindings, panel.existingIndex)
            CC:HideEditBindingPanel()
            CC:UpdateBlizzardFrameRegistration()
            CC:ApplyBindings()
            CC:RefreshActiveBindings()
            CC:RefreshSpellGrid(true)  -- Skip scroll reset to maintain position
        end,
        timeout = 0,
        whileDead = true,
        hideOnEscape = true,
        preferredIndex = 3,
    }
    ShowPopupOnTop("DF_EDITPANEL_CONFIRM_DELETE")
end

-- Process a keybind from the quick bind popup
function CC:ProcessKeybind(bindType, key)
    if not self.pendingSpellData then return end
    
    local spellData = self.pendingSpellData
    
    -- Build modifier string
    local mods = ""
    if IsShiftKeyDown() then mods = mods .. "shift-" end
    if IsControlKeyDown() then mods = mods .. "ctrl-" end
    if IsAltKeyDown() then mods = mods .. "alt-" end
    if IsMetaKeyDown() then mods = mods .. "meta-" end
    
    -- Use default scope and combat settings for quick bind
    local defaultScope = DEFAULT_BINDING_SCOPE  -- "blizzard"
    local defaultCombat = DEFAULT_BINDING_COMBAT  -- "always"
    
    -- Build the new binding with full defaults
    local newBinding = {
        enabled = true,
        bindType = bindType,
        modifiers = mods,
        scope = defaultScope,
        combat = defaultCombat,
        priority = 5,  -- Default priority (1=highest, 10=lowest)
        -- Default to all frames
        frames = {
            dandersFrames = true,
            otherFrames = true,
        },
        -- Default fallbacks: all off (opt-in)
        fallback = {
            mouseover = false,
            target = false,
            selfCast = false,
        },
        -- Default to any target
        targetType = "all",
    }
    
    if bindType == "mouse" then
        newBinding.button = key
    else
        newBinding.key = key
    end
    
    -- Set action type based on what we're binding
    if spellData.isMacro then
        -- Macro binding
        newBinding.actionType = self.ACTION_TYPES.MACRO
        newBinding.macroId = spellData.macroId
        newBinding.macroName = spellData.name
        -- Macros handle their own targeting, so no fallbacks
        newBinding.fallback = {
            mouseover = false,
            target = false,
            selfCast = false,
        }
    elseif spellData.isItem then
        -- Item binding (equipment slot or consumable)
        newBinding.actionType = self.ACTION_TYPES.ITEM
        newBinding.itemType = spellData.itemType
        if spellData.itemType == "slot" then
            newBinding.itemSlot = spellData.itemSlot
            newBinding.itemName = spellData.slotName or spellData.name
        else
            newBinding.itemId = spellData.itemId
            newBinding.itemName = spellData.name
        end
    elseif spellData.actionType and not spellData.spellName then
        newBinding.actionType = spellData.actionType
    else
        newBinding.actionType = self.ACTION_TYPES.SPELL
        newBinding.spellId = spellData.spellId
        newBinding.spellName = spellData.spellName or spellData.name
    end
    
    -- Hide popup and capture frame
    self:HideKeybindPopup()
    
    -- Check for duplicate binding
    local duplicateIndex = self:FindDuplicateBinding(newBinding)
    if duplicateIndex then
        print("|cffff9900DandersFrames:|r That binding already exists.")
        return
    end
    
    -- Check for key conflicts (same key combo, different action)
    local conflicts = self:FindKeyConflicts(newBinding, nil)
    if #conflicts > 0 then
        -- Store the pending binding for later
        self.pendingQuickBinding = newBinding
        
        -- Build conflict description
        local conflictDesc = ""
        for i, conflict in ipairs(conflicts) do
            local existingBinding = conflict.binding
            local actionName = self:GetBindingActionText(existingBinding) or "Unknown"
            if i > 1 then conflictDesc = conflictDesc .. "\n" end
            conflictDesc = conflictDesc .. "• " .. actionName
            if i >= 3 and #conflicts > 3 then
                conflictDesc = conflictDesc .. "\n• ... and " .. (#conflicts - 3) .. " more"
                break
            end
        end
        
        local keyText = self:GetBindingKeyText(newBinding)
        
        -- Show warning popup
        StaticPopupDialogs["DF_QUICKBIND_CONFLICT_WARNING"] = {
            text = "|cffff9900Warning:|r " .. keyText .. " is already bound to:\n\n" .. conflictDesc .. "\n\nMultiple bindings on the same key may not work as expected. Save anyway?",
            button1 = "Save Anyway",
            button2 = "Cancel",
            OnAccept = function()
                CC:CommitQuickBinding()
            end,
            timeout = 0,
            whileDead = true,
            hideOnEscape = true,
            preferredIndex = 3,
        }
        ShowPopupOnTop("DF_QUICKBIND_CONFLICT_WARNING")
        return
    end
    
    -- No conflicts, add directly
    self:CommitQuickBindingDirect(newBinding)
end

-- Commit the quick binding (called after conflict warning is accepted)
function CC:CommitQuickBinding()
    if not self.pendingQuickBinding then return end
    self:CommitQuickBindingDirect(self.pendingQuickBinding)
    self.pendingQuickBinding = nil
end

-- Actually add the quick binding
function CC:CommitQuickBindingDirect(newBinding)
    -- Add new binding (multiple bindings on same key allowed for fallback functionality)
    table.insert(self.db.bindings, newBinding)
    
    -- Debug for item bindings
    if newBinding.actionType == self.ACTION_TYPES.ITEM then
        print("|cff00ff00DF:|r Item binding added - " .. (newBinding.itemName or "?") .. " (" .. (newBinding.itemType or "?") .. ") total=" .. #self.db.bindings)
    end
    
    self:UpdateBlizzardFrameRegistration()
    self:ApplyBindings()
    self:RefreshSpellGrid(true)  -- Skip scroll reset to maintain position
end

function CC:ClearBindingsForSpell(spellName)
    if not spellName then return end
    
    local toRemove = {}
    for i, binding in ipairs(self.db.bindings) do
        if binding.spellName == spellName then
            table.insert(toRemove, 1, i) -- Insert at beginning so we remove from end first
        end
    end
    
    for _, idx in ipairs(toRemove) do
        table.remove(self.db.bindings, idx)
    end
    
    self:ApplyBindings()
end

function CC:ClearBindingsForAction(actionType)
    if not actionType then return end
    
    local toRemove = {}
    for i, binding in ipairs(self.db.bindings) do
        if binding.actionType == actionType and not binding.spellName then
            table.insert(toRemove, 1, i)
        end
    end
    
    for _, idx in ipairs(toRemove) do
        table.remove(self.db.bindings, idx)
    end
    
    self:ApplyBindings()
end

function CC:GetBindingsForSpell(spellName, displaySpellId)
    local bindings = {}
    
    -- If we have a displaySpellId, we can match bindings that resolve to the same display
    -- This handles transformation chains like Divine Toll/Holy Bulwark -> Sacred Weapon
    -- and Living Flame -> Chrono Flames
    for i, binding in ipairs(self.db.bindings) do
        if binding.spellName then
            -- Direct name match
            if binding.spellName == spellName then
                table.insert(bindings, binding)
            -- Check if this binding resolves to the same display spell
            elseif displaySpellId and binding.spellId then
                local _, _, bindingDisplayId = GetSpellDisplayInfo(binding.spellId, binding.spellName)
                if bindingDisplayId and bindingDisplayId == displaySpellId then
                    table.insert(bindings, binding)
                else
                    -- Also check if the binding's spell has the same root as our target
                    -- e.g., if binding is for "Living Flame" (361469) and we're showing Chrono Flames
                    local bindingRootId = binding.spellId
                    if C_Spell.GetBaseSpell then
                        local baseId = C_Spell.GetBaseSpell(binding.spellId)
                        if baseId then
                            bindingRootId = baseId
                        end
                    end
                    
                    -- Get our target spell's root
                    local targetRootId = displaySpellId
                    if C_Spell.GetBaseSpell then
                        local baseId = C_Spell.GetBaseSpell(displaySpellId)
                        if baseId then
                            targetRootId = baseId
                        end
                    end
                    
                    -- Match if roots are the same
                    if bindingRootId == targetRootId then
                        table.insert(bindings, binding)
                    end
                end
            end
        end
    end
    return bindings
end

function CC:GetBindingsForAction(actionType)
    local bindings = {}
    for i, binding in ipairs(self.db.bindings) do
        if binding.actionType == actionType and not binding.spellName then
            table.insert(bindings, binding)
        end
    end
    return bindings
end

function CC:CreateSpellCell(parent, spellData, index)
    local themeColor = {r = 0.2, g = 0.8, b = 0.4}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.6, g = 0.6, b = 0.6}
    
    local cellWidth = 85
    local cellHeight = 75
    
    local cell = CreateFrame("Button", nil, parent, "BackdropTemplate")
    cell:SetSize(cellWidth, cellHeight)
    cell:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    cell:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 0.8)
    cell:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    cell:RegisterForClicks("AnyDown")
    
    -- Get display info (shows current override name/icon for talent-modified spells)
    local displayName, displayIcon, displaySpellId
    if spellData.spellId then
        displayName, displayIcon, displaySpellId = GetSpellDisplayInfo(spellData.spellId, spellData.name)
    else
        displayName = spellData.name
        displayIcon = spellData.icon
        displaySpellId = spellData.spellId
    end
    
    -- Icon (larger now that we don't have binding text)
    local icon = cell:CreateTexture(nil, "ARTWORK")
    icon:SetPoint("TOP", 0, -5)
    icon:SetSize(40, 40)
    icon:SetTexture(displayIcon or spellData.icon)
    icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
    
    -- Name (use current display name, can wrap to 2 lines)
    local name = cell:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    name:SetPoint("TOP", icon, "BOTTOM", 0, -2)
    name:SetPoint("BOTTOM", 0, 3)
    name:SetWidth(cellWidth - 4)
    name:SetText(displayName or spellData.name)
    name:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    name:SetWordWrap(true)
    name:SetMaxLines(2)
    
    -- Check for existing binding - just set border color, no text
    -- Pass displaySpellId to match bindings that resolve to the same displayed spell
    local existingBindings = CC:GetBindingsForSpell(spellData.name, displaySpellId)
    if #existingBindings > 0 then
        cell:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
    end
    
    cell.spellData = spellData
    cell.existingBindings = existingBindings
    cell.displaySpellId = displaySpellId  -- Store for tooltip
    
    -- Hover effects
    cell:SetScript("OnEnter", function(self)
        self:SetBackdropColor(themeColor.r * 0.3, themeColor.g * 0.3, themeColor.b * 0.3, 1)
        
        -- Show tooltip (use current override spell ID for accurate tooltip)
        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
        if self.displaySpellId or spellData.spellId then
            GameTooltip:SetSpellByID(self.displaySpellId or spellData.spellId)
        else
            GameTooltip:SetText(spellData.name)
        end
        
        -- Show existing bindings in tooltip if any
        local bindings = self.existingBindings or CC:GetBindingsForSpell(spellData.name, self.displaySpellId)
        if #bindings > 0 then
            GameTooltip:AddLine(" ")
            local bindStrs = {}
            for _, b in ipairs(bindings) do
                table.insert(bindStrs, CC:GetBindingKeyText(b, true))
            end
            GameTooltip:AddLine(format(L["Bound: %s"], table.concat(bindStrs, ", ")), themeColor.r, themeColor.g, themeColor.b)
        end
        
        GameTooltip:AddLine(" ")
        GameTooltip:AddLine(L["Left-click to add/edit binding"], 0.7, 0.7, 0.7)
        GameTooltip:Show()
    end)
    
    cell:SetScript("OnLeave", function(self)
        self:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 0.8)
        GameTooltip:Hide()
    end)
    
    -- Click handlers
    cell:SetScript("OnClick", function(self, button)
        if button == "LeftButton" then
            -- Pass BASE spell info for binding (spellData.name), but display will show override
            local spellInfo = {
                spellName = spellData.name,  -- Base name for binding
                spellId = spellData.spellId,  -- Base ID for binding
                name = spellData.name,
                icon = spellData.icon,
            }
            
            if CC.db.options.quickBindEnabled then
                -- Quick bind mode - show simple keybind popup
                CC:ShowKeybindPopup(spellInfo)
            else
                -- Full edit mode - show edit binding panel
                CC:ShowEditBindingPanel(spellInfo, nil, nil)
            end
        end
    end)
    
    return cell
end

function CC:RefreshSpellGrid(skipScrollReset)
    if not self.scrollContent then return end
    
    -- Save current scroll position before refresh (for access by sub-functions)
    self._savedScrollPos = nil
    if skipScrollReset and self.scrollFrame then
        self._savedScrollPos = self.scrollFrame:GetVerticalScroll()
    end
    
    -- Refresh the active bindings section
    self:RefreshActiveBindings()
    
    -- Update checkboxes
    if self.enableCb then
        self.enableCb:SetChecked(self.db.enabled)
    end
    if self.downCb then
        self.downCb:SetChecked(self.db.options.castOnDown)
    end
    if self.quickBindCb then
        self.quickBindCb:SetChecked(self.db.options.quickBindEnabled)
    end
    if self.UpdateSmartResText then
        self.UpdateSmartResText()
    end
    if self.UpdateProfileDropdown then
        self.UpdateProfileDropdown()
    end
    
    -- If profiles tab is active, show profiles panel and hide spell grid
    if self.activeTab == "profiles" then
        if self.spellGrid then self.spellGrid:Hide() end
        if self.profilesPanel then 
            self.profilesPanel:Show() 
            self:RefreshProfilesPanel()
        end
        return
    else
        if self.spellGrid then self.spellGrid:Show() end
        if self.profilesPanel then self.profilesPanel:Hide() end
    end
    
    -- Update dropdown values (if they exist)
    if self.showDropdown and self.showDropdown.SetValue then
        self.showDropdown:SetValue(self.selectedSpellType or "all")
    end
    
    -- Clear existing cells
    for _, cell in ipairs(CC.spellCells) do
        cell:Hide()
        cell:SetParent(nil)
    end
    wipe(CC.spellCells)
    
    -- Branch based on active tab
    if self.activeTab == "macros" then
        self:RefreshMacroGrid(skipScrollReset)
        return
    end
    
    if self.activeTab == "items" then
        self:RefreshItemsGrid(skipScrollReset)
        return
    end
    
    -- Get search filter from search box
    local searchFilter = self.searchBox and self.searchBox:GetText() or ""
    
    -- Initialize view mode button states
    if self.SetActiveLayout then
        self.SetActiveLayout(self.viewLayout or "grid")
    end
    if self.SetActiveSort then
        self.SetActiveSort(self.viewSort or "sectioned")
    end
    
    -- Determine layout and sort mode
    local viewLayout = self.viewLayout or "grid"
    local viewSort = self.viewSort or "sectioned"
    
    -- Calculate layout based on view layout
    local containerWidth = self.gridContainer:GetWidth() - 35
    local cellWidth, cellHeight, padding, cols
    
    if viewLayout == "list" then
        cellWidth = containerWidth
        cellHeight = 28  -- Smaller rows without binding text
        padding = 2
        cols = 1
    else
        cellWidth = 85   -- Smaller cells
        cellHeight = 75  -- Smaller height without binding text
        padding = 5
        cols = math.floor(containerWidth / (cellWidth + padding))
        if cols < 1 then cols = 1 end
    end
    
    local row, col = 0, 0
    local totalCells = 0
    local yOffset = 0  -- Track Y offset for list views
    
    -- Add special actions first (Target and Menu) - only if not text filtering and showing all spell types
    local spellTypeFilter = self.selectedSpellType or "all"
    if (not searchFilter or searchFilter == "") and spellTypeFilter == "all" then
        if viewLayout == "list" then
            -- List-style view special actions
            local targetRow = self:CreateSpellListRow(self.scrollContent, {name = "Target Unit", icon = "Interface\\CURSOR\\Crosshairs", spellId = nil}, 1, true, "target")
            targetRow:SetPoint("TOPLEFT", 0, -yOffset)
            table.insert(CC.spellCells, targetRow)
            totalCells = totalCells + 1
            yOffset = yOffset + cellHeight + padding
            row = row + 1
            
            local menuRow = self:CreateSpellListRow(self.scrollContent, {name = "Open Menu", icon = "Interface\\Buttons\\UI-GuildButton-OfficerNote-Up", spellId = nil}, 2, true, "menu")
            menuRow:SetPoint("TOPLEFT", 0, -yOffset)
            table.insert(CC.spellCells, menuRow)
            totalCells = totalCells + 1
            yOffset = yOffset + cellHeight + padding
            row = row + 1
            
            local focusRow = self:CreateSpellListRow(self.scrollContent, {name = "Set Focus", icon = "Interface\\Icons\\Ability_Hunter_MasterMarksman", spellId = nil}, 3, true, "focus")
            focusRow:SetPoint("TOPLEFT", 0, -yOffset)
            table.insert(CC.spellCells, focusRow)
            totalCells = totalCells + 1
            yOffset = yOffset + cellHeight + padding
            row = row + 1
            
            local assistRow = self:CreateSpellListRow(self.scrollContent, {name = "Assist", icon = "Interface\\Icons\\Ability_Hunter_SniperShot", spellId = nil}, 4, true, "assist")
            assistRow:SetPoint("TOPLEFT", 0, -yOffset)
            table.insert(CC.spellCells, assistRow)
            totalCells = totalCells + 1
            yOffset = yOffset + cellHeight + padding
            row = row + 1
        else
            -- Grid view special actions
            local targetCell = self:CreateSpecialActionCell(self.scrollContent, "target", "Target Unit", "Interface\\CURSOR\\Crosshairs")
            targetCell:SetPoint("TOPLEFT", col * (cellWidth + padding), -row * (cellHeight + padding))
            table.insert(CC.spellCells, targetCell)
            totalCells = totalCells + 1
            col = col + 1
            if col >= cols then col = 0; row = row + 1 end
            
            local menuCell = self:CreateSpecialActionCell(self.scrollContent, "menu", "Open Menu", "Interface\\Buttons\\UI-GuildButton-OfficerNote-Up")
            menuCell:SetPoint("TOPLEFT", col * (cellWidth + padding), -row * (cellHeight + padding))
            table.insert(CC.spellCells, menuCell)
            totalCells = totalCells + 1
            col = col + 1
            if col >= cols then col = 0; row = row + 1 end
        end
    end
    
    -- Get all spells
    local spells = self:GetAllPlayerSpells()
    
    -- Apply search filter and spell type filter
    local filteredSpells = {}
    local lowerSearchFilter = searchFilter:lower()
    
    for _, spell in ipairs(spells) do
        -- Search against both base name and display name (for overrides like Chrono Flames)
        local baseName = spell.name or ""
        local displayName = spell.displayName or baseName
        local passesSearch = (searchFilter == "") or 
            baseName:lower():find(lowerSearchFilter, 1, true) or
            displayName:lower():find(lowerSearchFilter, 1, true)
        
        -- Check spell type filter
        local passesTypeFilter = true
        if spellTypeFilter ~= "all" and spell.spellId then
            local isHelpful = C_Spell.IsSpellHelpful(spell.spellId)
            local isHarmful = C_Spell.IsSpellHarmful(spell.spellId)
            
            if spellTypeFilter == "helpful" then
                passesTypeFilter = isHelpful
            elseif spellTypeFilter == "harmful" then
                passesTypeFilter = isHarmful
            end
        end
        
        if passesSearch and passesTypeFilter then
            table.insert(filteredSpells, spell)
        end
    end
    
    -- Sort spells based on viewSort mode
    table.sort(filteredSpells, function(a, b)
        if viewSort == "sectioned" then
            -- Sectioned mode: sort by category priority, then alphabetically
            -- Bound and unbound spells are mixed together within categories
            local aPriority = a.categoryPriority or 99
            local bPriority = b.categoryPriority or 99
            
            if aPriority ~= bPriority then
                return aPriority < bPriority
            end
            
            -- Within same category, sort alphabetically
            return a.name < b.name
        elseif viewSort == "alphabetical" then
            -- Pure alphabetical
            return a.name < b.name
        else
            -- Priority mode: bound spells first, then by category
            -- Get displaySpellId for proper override matching
            local _, _, aDisplayId = GetSpellDisplayInfo(a.spellId, a.name)
            local _, _, bDisplayId = GetSpellDisplayInfo(b.spellId, b.name)
            local aBindings = CC:GetBindingsForSpell(a.name, aDisplayId)
            local bBindings = CC:GetBindingsForSpell(b.name, bDisplayId)
            local aHasBinding = #aBindings > 0
            local bHasBinding = #bBindings > 0
            
            -- Bound spells come first
            if aHasBinding and not bHasBinding then
                return true
            elseif not aHasBinding and bHasBinding then
                return false
            end
            
            -- Within same binding status, sort by category then alphabetically
            local aPriority = a.categoryPriority or 99
            local bPriority = b.categoryPriority or 99
            
            if aPriority ~= bPriority then
                return aPriority < bPriority
            end
            
            return a.name < b.name
        end
    end)
    
    -- Helper function to create section header (for sectioned sort mode)
    local function CreateSectionHeader(parent, text, yPos)
        local header = CreateFrame("Frame", nil, parent)
        header:SetSize(containerWidth, 24)
        header:SetPoint("TOPLEFT", 0, -yPos)
        
        local label = header:CreateFontString(nil, "OVERLAY", "DFFontNormal")
        label:SetPoint("LEFT", 5, 0)
        label:SetText(text)
        label:SetTextColor(0.2, 0.8, 0.4, 1)  -- Theme color
        
        local line = header:CreateTexture(nil, "ARTWORK")
        line:SetHeight(1)
        line:SetPoint("LEFT", label, "RIGHT", 8, 0)
        line:SetPoint("RIGHT", header, "RIGHT", -5, 0)
        line:SetColorTexture(0.3, 0.3, 0.3, 0.8)
        
        return header
    end
    
    -- Category names for section headers (no Bound category - use Active Bindings for that)
    local categoryNames = {
        [1] = "Specialization",
        [2] = "Class",
        [3] = "Racial",
        [4] = "Other",
        [5] = "Guild",
    }
    
    -- Create spell cells based on layout and sort mode
    if viewSort == "sectioned" then
        -- Sectioned mode: show category headers
        local currentSection = nil
        local headerHeight = 24
        
        if viewLayout == "list" then
            -- List layout with sections
            for i, spell in ipairs(filteredSpells) do
                local spellCategory = spell.categoryPriority or 99
                
                -- Use the spell's natural category
                local sectionKey = spellCategory
                
                -- Create section header if section changed
                if sectionKey ~= currentSection then
                    currentSection = sectionKey
                    local headerText = categoryNames[sectionKey] or "Other"
                    local header = CreateSectionHeader(self.scrollContent, headerText, yOffset)
                    table.insert(CC.spellCells, header)
                    yOffset = yOffset + headerHeight + padding
                end
                
                local cell = self:CreateSpellListRow(self.scrollContent, spell, i, false, nil)
                cell:SetPoint("TOPLEFT", 0, -yOffset)
                table.insert(CC.spellCells, cell)
                totalCells = totalCells + 1
                yOffset = yOffset + cellHeight + padding
            end
            
            self.scrollContent:SetHeight(math.max(200, yOffset + padding))
            self.scrollContent:SetWidth(containerWidth)
        else
            -- Grid layout with sections
            local gridYOffset = 0  -- Track vertical position with smaller header heights
            local gridHeaderHeight = 28  -- Smaller header for grid
            
            for i, spell in ipairs(filteredSpells) do
                local spellCategory = spell.categoryPriority or 99
                
                -- Use the spell's natural category
                local sectionKey = spellCategory
                
                -- Create section header if section changed
                if sectionKey ~= currentSection then
                    -- Finish current row if we were mid-row
                    if col > 0 then
                        gridYOffset = gridYOffset + cellHeight + padding
                        col = 0
                    end
                    
                    currentSection = sectionKey
                    local headerText = categoryNames[sectionKey] or "Other"
                    local header = CreateSectionHeader(self.scrollContent, headerText, gridYOffset)
                    table.insert(CC.spellCells, header)
                    gridYOffset = gridYOffset + gridHeaderHeight  -- Smaller spacing after header
                end
                
                local cell = self:CreateSpellCell(self.scrollContent, spell, i)
                cell:SetPoint("TOPLEFT", col * (cellWidth + padding), -gridYOffset)
                table.insert(CC.spellCells, cell)
                totalCells = totalCells + 1
                col = col + 1
                if col >= cols then
                    col = 0
                    gridYOffset = gridYOffset + cellHeight + padding
                end
            end
            
            -- Account for partial last row
            if col > 0 then 
                gridYOffset = gridYOffset + cellHeight + padding
            end
            self.scrollContent:SetHeight(math.max(200, gridYOffset + padding))
            self.scrollContent:SetWidth(containerWidth)
        end
    else
        -- Priority or Alphabetical mode: no section headers
        if viewLayout == "list" then
            for i, spell in ipairs(filteredSpells) do
                local cell = self:CreateSpellListRow(self.scrollContent, spell, i, false, nil)
                cell:SetPoint("TOPLEFT", 0, -yOffset)
                table.insert(CC.spellCells, cell)
                totalCells = totalCells + 1
                yOffset = yOffset + cellHeight + padding
            end
            
            self.scrollContent:SetHeight(math.max(200, yOffset + padding))
            self.scrollContent:SetWidth(containerWidth)
        else
            -- Grid layout
            for i, spell in ipairs(filteredSpells) do
                local cell = self:CreateSpellCell(self.scrollContent, spell, i)
                cell:SetPoint("TOPLEFT", col * (cellWidth + padding), -row * (cellHeight + padding))
                table.insert(CC.spellCells, cell)
                totalCells = totalCells + 1
                col = col + 1
                if col >= cols then
                    col = 0
                    row = row + 1
                end
            end
            
            -- Account for partial last row
            if col > 0 then row = row + 1 end
            self.scrollContent:SetHeight(math.max(200, row * (cellHeight + padding) + padding))
            self.scrollContent:SetWidth(containerWidth)
        end
    end
    
    -- Restore scroll position after refresh (use timer to ensure content is fully laid out)
    if self._savedScrollPos and self.scrollFrame then
        C_Timer.After(0, function()
            if CC.scrollFrame then
                CC.scrollFrame:SetVerticalScroll(CC._savedScrollPos or 0)
            end
        end)
    elseif not self._savedScrollPos and self.scrollFrame then
        -- Reset to top when not preserving position
        self.scrollFrame:SetVerticalScroll(0)
    end
end

-- Refresh the macro grid (when Macros tab is active)
function CC:RefreshMacroGrid(skipScrollReset)
    local themeColor = DF.GUI and DF.GUI.GetThemeColor and DF.GUI.GetThemeColor() or {r = 0.2, g = 0.8, b = 0.4}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.6, g = 0.6, b = 0.6}
    
    -- Get search filter
    local searchFilter = self.searchBox and self.searchBox:GetText() or ""
    local lowerSearchFilter = searchFilter:lower()
    
    -- Initialize view mode button states
    if self.SetActiveLayout then
        self.SetActiveLayout(self.viewLayout or "grid")
    end
    if self.SetActiveSort then
        self.SetActiveSort(self.viewSort or "sectioned")
    end
    
    -- Determine layout
    local viewLayout = self.viewLayout or "grid"
    local containerWidth = self.gridContainer:GetWidth() - 35
    local cellWidth, cellHeight, padding, cols
    
    if viewLayout == "list" then
        cellWidth = containerWidth
        cellHeight = 32
        padding = 2
        cols = 1
    else
        cellWidth = 100
        cellHeight = 95
        padding = 5
        cols = math.floor(containerWidth / (cellWidth + padding))
        if cols < 1 then cols = 1 end
    end
    
    -- Get macros filtered by source
    local sourceFilter = self.selectedMacroSource or "all"
    local allMacros = self:GetMacrosBySource(sourceFilter)
    
    -- Apply search filter
    local filteredMacros = {}
    for _, macro in ipairs(allMacros) do
        local passesSearch = (searchFilter == "") or macro.name:lower():find(lowerSearchFilter, 1, true)
        if passesSearch then
            table.insert(filteredMacros, macro)
        end
    end
    
    -- Sort macros based on viewSort mode
    local viewSort = self.viewSort or "sectioned"
    
    -- For "sectioned" mode with macros, group by category (source)
    if viewSort == "sectioned" or viewSort == "categories" then
        -- Sort by source first, then by binding status, then alphabetically
        table.sort(filteredMacros, function(a, b)
            -- Source order: custom first, then global_import, then char_import
            local sourceOrder = { custom = 1, global_import = 2, char_import = 3 }
            local aOrder = sourceOrder[a.source] or 4
            local bOrder = sourceOrder[b.source] or 4
            
            if aOrder ~= bOrder then
                return aOrder < bOrder
            end
            
            -- Within same source, bound macros first
            local aBindings = self:GetBindingsForMacro(a.id)
            local bBindings = self:GetBindingsForMacro(b.id)
            local aHasBinding = #aBindings > 0
            local bHasBinding = #bBindings > 0
            
            if aHasBinding and not bHasBinding then return true end
            if not aHasBinding and bHasBinding then return false end
            
            return a.name < b.name
        end)
    else
        -- Alphabetical mode
        table.sort(filteredMacros, function(a, b)
            return a.name < b.name
        end)
    end
    
    local row, col = 0, 0
    local yOffset = 0
    
    -- Track current category for headers
    local currentSource = nil
    local sourceNames = {
        custom = "Custom Macros",
        global_import = "General Imports",
        char_import = "Character Imports",
    }
    
    -- Helper to create category header
    local function CreateCategoryHeader(parent, text, y)
        local headerFrame = CreateFrame("Frame", nil, parent)
        headerFrame:SetSize(containerWidth, 20)
        headerFrame:SetPoint("TOPLEFT", 0, -y)
        
        local header = headerFrame:CreateFontString(nil, "OVERLAY", "DFFontNormal")
        header:SetPoint("LEFT", 4, 0)
        header:SetText(text)
        header:SetTextColor(themeColor.r, themeColor.g, themeColor.b)
        
        -- Underline
        local line = headerFrame:CreateTexture(nil, "ARTWORK")
        line:SetPoint("BOTTOMLEFT", 0, 0)
        line:SetPoint("BOTTOMRIGHT", 0, 0)
        line:SetHeight(1)
        line:SetColorTexture(themeColor.r * 0.5, themeColor.g * 0.5, themeColor.b * 0.5, 0.5)
        
        return headerFrame
    end
    
    -- Show empty state if no macros
    if #filteredMacros == 0 then
        local emptyMsg = self.scrollContent:CreateFontString(nil, "OVERLAY", "DFFontNormal")
        emptyMsg:SetPoint("CENTER", 0, 0)
        if #self:GetAllMacros() == 0 then
            emptyMsg:SetText(L["No macros yet.\nClick '+ New' to create one or 'Import' to import from WoW."])
        else
            emptyMsg:SetText(L["No macros match the current filter."])
        end
        emptyMsg:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
        table.insert(CC.spellCells, emptyMsg)
        self.scrollContent:SetHeight(200)
        return
    end
    
    -- Create cells/rows for macros
    local showCategoryHeaders = (viewSort == "sectioned" or viewSort == "categories")
    local headerHeight = 22
    
    if viewLayout == "list" then
        for i, macro in ipairs(filteredMacros) do
            -- Add category header if source changed
            if showCategoryHeaders and macro.source ~= currentSource then
                currentSource = macro.source
                local headerText = sourceNames[macro.source] or "Other"
                local header = CreateCategoryHeader(self.scrollContent, headerText, yOffset)
                table.insert(CC.spellCells, header)
                yOffset = yOffset + headerHeight
            end
            
            local listRow = self:CreateMacroListRow(self.scrollContent, macro, i)
            listRow:SetPoint("TOPLEFT", 0, -yOffset)
            table.insert(CC.spellCells, listRow)
            yOffset = yOffset + cellHeight + padding
        end
        self.scrollContent:SetHeight(math.max(200, yOffset + padding))
    else
        local gridYOffset = 0
        for i, macro in ipairs(filteredMacros) do
            -- Add category header if source changed
            if showCategoryHeaders and macro.source ~= currentSource then
                -- If we're mid-row, move to next row first
                if col > 0 then
                    col = 0
                    gridYOffset = gridYOffset + cellHeight + padding
                end
                
                currentSource = macro.source
                local headerText = sourceNames[macro.source] or "Other"
                local header = CreateCategoryHeader(self.scrollContent, headerText, gridYOffset)
                table.insert(CC.spellCells, header)
                gridYOffset = gridYOffset + headerHeight
            end
            
            local cell = self:CreateMacroCell(self.scrollContent, macro, i)
            cell:SetPoint("TOPLEFT", col * (cellWidth + padding), -gridYOffset)
            table.insert(CC.spellCells, cell)
            col = col + 1
            if col >= cols then
                col = 0
                gridYOffset = gridYOffset + cellHeight + padding
            end
        end
        if col > 0 then gridYOffset = gridYOffset + cellHeight + padding end
        self.scrollContent:SetHeight(math.max(200, gridYOffset + padding))
    end
    
    self.scrollContent:SetWidth(containerWidth)
    
    -- Restore scroll position after refresh
    if self._savedScrollPos and self.scrollFrame then
        C_Timer.After(0, function()
            if CC.scrollFrame then
                CC.scrollFrame:SetVerticalScroll(CC._savedScrollPos or 0)
            end
        end)
    end
end

-- Refresh items grid
function CC:RefreshItemsGrid(skipScrollReset)
    local themeColor = DF.GUI and DF.GUI.GetThemeColor and DF.GUI.GetThemeColor() or {r = 0.2, g = 0.8, b = 0.4}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.6, g = 0.6, b = 0.6}
    local C_BACKGROUND = {r = 0.12, g = 0.12, b = 0.12}
    
    -- Initialize view mode button states
    if self.SetActiveLayout then
        self.SetActiveLayout(self.viewLayout or "grid")
    end
    
    -- Determine layout
    local viewLayout = self.viewLayout or "grid"
    local containerWidth = self.gridContainer:GetWidth() - 35
    local cellWidth, cellHeight, padding, cols
    
    if viewLayout == "list" then
        cellWidth = containerWidth
        cellHeight = 36
        padding = 2
        cols = 1
    else
        cellWidth = 100
        cellHeight = 95
        padding = 5
        cols = math.floor(containerWidth / (cellWidth + padding))
        if cols < 1 then cols = 1 end
    end
    
    local yOffset = 0
    local col = 0
    
    -- Helper to create section header
    local function CreateSectionHeader(parent, text, y)
        local headerFrame = CreateFrame("Frame", nil, parent)
        headerFrame:SetSize(containerWidth, 22)
        headerFrame:SetPoint("TOPLEFT", 0, -y)
        
        local headerText = headerFrame:CreateFontString(nil, "OVERLAY", "DFFontNormal")
        headerText:SetPoint("LEFT", 4, 0)
        headerText:SetText(text)
        headerText:SetTextColor(themeColor.r, themeColor.g, themeColor.b)
        
        local line = headerFrame:CreateTexture(nil, "ARTWORK")
        line:SetHeight(1)
        line:SetPoint("LEFT", headerText, "RIGHT", 8, 0)
        line:SetPoint("RIGHT", -4, 0)
        line:SetColorTexture(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
        
        return headerFrame
    end
    
    -- Equipment Slots Section
    local equipHeader = CreateSectionHeader(self.scrollContent, "Equipment Slots", yOffset)
    table.insert(CC.spellCells, equipHeader)
    yOffset = yOffset + 26
    col = 0
    
    for i, slotData in ipairs(self.EQUIPMENT_SLOTS) do
        local slotInfo = self:GetSlotItemInfo(slotData.slot)
        local itemData = {
            slot = slotData.slot,
            slotName = slotData.name,
            defaultIcon = slotData.icon,
            itemInfo = slotInfo,
        }
        
        local cell
        if viewLayout == "list" then
            cell = self:CreateItemListRow(self.scrollContent, itemData, i)
            cell:SetPoint("TOPLEFT", 0, -yOffset)
            yOffset = yOffset + cellHeight + padding
        else
            cell = self:CreateItemCell(self.scrollContent, itemData, i)
            cell:SetPoint("TOPLEFT", col * (cellWidth + padding), -yOffset)
            col = col + 1
            if col >= cols then
                col = 0
                yOffset = yOffset + cellHeight + padding
            end
        end
        table.insert(CC.spellCells, cell)
    end
    
    -- Finish current row if grid layout
    if viewLayout ~= "list" and col > 0 then
        yOffset = yOffset + cellHeight + padding
    end
    
    -- Add some spacing before consumables
    yOffset = yOffset + 10
    
    -- Consumables Section
    local consumHeader = CreateSectionHeader(self.scrollContent, "Consumables (Drag items here)", yOffset)
    table.insert(CC.spellCells, consumHeader)
    yOffset = yOffset + 26
    col = 0
    
    -- Get saved consumables from db
    local consumables = self.db.savedConsumables or {}
    
    -- Add common consumables that aren't already saved
    local seenItems = {}
    for _, cons in ipairs(consumables) do
        seenItems[cons.itemId] = true
    end
    
    -- Display saved consumables
    for i, cons in ipairs(consumables) do
        local itemInfo = self:GetItemInfoById(cons.itemId)
        local itemData = {
            itemType = "consumable",
            itemId = cons.itemId,
            itemInfo = itemInfo,
            savedIndex = i,
        }
        
        local cell
        if viewLayout == "list" then
            cell = self:CreateConsumableListRow(self.scrollContent, itemData, i)
            cell:SetPoint("TOPLEFT", 0, -yOffset)
            yOffset = yOffset + cellHeight + padding
        else
            cell = self:CreateConsumableCell(self.scrollContent, itemData, i)
            cell:SetPoint("TOPLEFT", col * (cellWidth + padding), -yOffset)
            col = col + 1
            if col >= cols then
                col = 0
                yOffset = yOffset + cellHeight + padding
            end
        end
        table.insert(CC.spellCells, cell)
    end
    
    -- Finish current row
    if viewLayout ~= "list" and col > 0 then
        yOffset = yOffset + cellHeight + padding
        col = 0
    end
    
    -- Drop zone for adding new consumables
    local dropZone = CreateFrame("Button", nil, self.scrollContent, "BackdropTemplate")
    if viewLayout == "list" then
        dropZone:SetSize(containerWidth, 40)
    else
        dropZone:SetSize(cellWidth, cellHeight)
    end
    dropZone:SetPoint("TOPLEFT", col * (cellWidth + padding), -yOffset)
    dropZone:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    dropZone:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 0.5)
    dropZone:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 0.3)
    
    local dropText = dropZone:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    dropText:SetPoint("CENTER")
    dropText:SetText("+ Drop Item")
    dropText:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    -- Handle item drops
    dropZone:SetScript("OnReceiveDrag", function()
        local infoType, itemId = GetCursorInfo()
        if infoType == "item" and itemId then
            ClearCursor()
            -- Add to saved consumables
            if not self.db.savedConsumables then
                self.db.savedConsumables = {}
            end
            -- Check if already saved
            for _, cons in ipairs(self.db.savedConsumables) do
                if cons.itemId == itemId then
                    print("|cff00ff00DandersFrames:|r Item already in list")
                    return
                end
            end
            local itemName = C_Item.GetItemInfo(itemId)
            table.insert(self.db.savedConsumables, {
                itemId = itemId,
                name = itemName or "Unknown Item",
            })
            self:RefreshSpellGrid(true)  -- Skip scroll reset to maintain position
        end
    end)
    
    dropZone:SetScript("OnClick", function()
        -- Same as receive drag
        local infoType, itemId = GetCursorInfo()
        if infoType == "item" and itemId then
            ClearCursor()
            if not self.db.savedConsumables then
                self.db.savedConsumables = {}
            end
            for _, cons in ipairs(self.db.savedConsumables) do
                if cons.itemId == itemId then
                    print("|cff00ff00DandersFrames:|r Item already in list")
                    return
                end
            end
            local itemName = C_Item.GetItemInfo(itemId)
            table.insert(self.db.savedConsumables, {
                itemId = itemId,
                name = itemName or "Unknown Item",
            })
            self:RefreshSpellGrid(true)  -- Skip scroll reset to maintain position
        end
    end)
    
    dropZone:SetScript("OnEnter", function(self)
        self:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 0.8)
        dropText:SetTextColor(themeColor.r, themeColor.g, themeColor.b)
    end)
    dropZone:SetScript("OnLeave", function(self)
        self:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 0.3)
        dropText:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    end)
    
    table.insert(CC.spellCells, dropZone)
    
    if viewLayout == "list" then
        yOffset = yOffset + 44
    else
        yOffset = yOffset + cellHeight + padding
    end
    
    self.scrollContent:SetHeight(math.max(200, yOffset + padding))
    self.scrollContent:SetWidth(containerWidth)
    
    -- Restore scroll position after refresh
    if self._savedScrollPos and self.scrollFrame then
        C_Timer.After(0, function()
            if CC.scrollFrame then
                CC.scrollFrame:SetVerticalScroll(CC._savedScrollPos or 0)
            end
        end)
    end
end

-- Create a grid cell for an equipment slot item
function CC:CreateItemCell(parent, itemData, index)
    local themeColor = DF.GUI and DF.GUI.GetThemeColor and DF.GUI.GetThemeColor() or {r = 0.2, g = 0.8, b = 0.4}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.6, g = 0.6, b = 0.6}
    
    local cellWidth = 85
    local cellHeight = 75
    
    local cell = CreateFrame("Button", nil, parent, "BackdropTemplate")
    cell:SetSize(cellWidth, cellHeight)
    cell:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    cell:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    cell:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    
    -- Icon
    local iconSize = 40
    local icon = cell:CreateTexture(nil, "ARTWORK")
    icon:SetSize(iconSize, iconSize)
    icon:SetPoint("TOP", 0, -5)
    
    local itemInfo = itemData.itemInfo
    if itemInfo and itemInfo.icon then
        icon:SetTexture(itemInfo.icon)
    else
        icon:SetTexture(itemData.defaultIcon)
        icon:SetVertexColor(0.5, 0.5, 0.5, 0.8)
    end
    
    -- Item name
    local nameText = cell:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    nameText:SetPoint("TOP", icon, "BOTTOM", 0, -2)
    nameText:SetPoint("BOTTOM", 0, 3)
    nameText:SetWidth(cellWidth - 4)
    nameText:SetJustifyH("CENTER")
    nameText:SetWordWrap(true)
    nameText:SetMaxLines(2)
    
    if itemInfo and itemInfo.name then
        nameText:SetText(itemInfo.name)
        nameText:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    else
        nameText:SetText(itemData.slotName)
        nameText:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    end
    
    -- On-Use indicator
    if itemInfo and itemInfo.hasOnUse then
        local onUseBadge = cell:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
        onUseBadge:SetPoint("TOPLEFT", 4, -4)
        onUseBadge:SetText(L["USE"])
        onUseBadge:SetTextColor(themeColor.r, themeColor.g, themeColor.b)
    end
    
    -- Check for existing binding - just set border color (no text)
    local bindings = self:GetBindingsForItem(itemData.slot)
    if #bindings > 0 then
        cell:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
    end
    
    cell.itemData = itemData
    cell.existingBindings = bindings
    
    -- Hover effect
    cell:SetScript("OnEnter", function(self)
        self:SetBackdropColor(C_ELEMENT.r + 0.08, C_ELEMENT.g + 0.08, C_ELEMENT.b + 0.08, 1)
        
        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
        if itemInfo then
            GameTooltip:SetInventoryItem("player", itemData.slot)
        else
            GameTooltip:AddLine(itemData.slotName, 1, 1, 1)
            GameTooltip:AddLine(L["No item equipped"], 0.5, 0.5, 0.5)
        end
        
        -- Show existing bindings in tooltip
        local myBindings = self.existingBindings
        if myBindings and #myBindings > 0 then
            GameTooltip:AddLine(" ")
            local bindStrs = {}
            for _, b in ipairs(myBindings) do
                table.insert(bindStrs, CC:GetBindingKeyText(b, true))
            end
            GameTooltip:AddLine(format(L["Bound: %s"], table.concat(bindStrs, ", ")), themeColor.r, themeColor.g, themeColor.b)
        end
        
        GameTooltip:AddLine(" ")
        GameTooltip:AddLine(L["Left-click to add/edit binding"], 0.7, 0.7, 0.7)
        GameTooltip:Show()
    end)
    cell:SetScript("OnLeave", function(self)
        self:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
        if #(self.existingBindings or {}) == 0 then
            self:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
        end
        GameTooltip:Hide()
    end)
    
    -- Click to bind
    cell:SetScript("OnClick", function(self, button)
        if button == "LeftButton" then
            CC:ShowItemKeybindPopup(itemData)
        end
    end)
    
    return cell
end

-- Create a list row for an equipment slot item
function CC:CreateItemListRow(parent, itemData, index)
    local themeColor = DF.GUI and DF.GUI.GetThemeColor and DF.GUI.GetThemeColor() or {r = 0.2, g = 0.8, b = 0.4}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.6, g = 0.6, b = 0.6}
    
    local containerWidth = self.gridContainer:GetWidth() - 35
    
    local row = CreateFrame("Button", nil, parent, "BackdropTemplate")
    row:SetSize(containerWidth, 28)
    row:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    row:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    row:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    
    -- Icon
    local icon = row:CreateTexture(nil, "ARTWORK")
    icon:SetSize(22, 22)
    icon:SetPoint("LEFT", 4, 0)
    
    local itemInfo = itemData.itemInfo
    if itemInfo and itemInfo.icon then
        icon:SetTexture(itemInfo.icon)
    else
        icon:SetTexture(itemData.defaultIcon)
        icon:SetVertexColor(0.5, 0.5, 0.5, 0.8)
    end
    
    -- Slot name
    local slotText = row:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    slotText:SetPoint("LEFT", icon, "RIGHT", 8, 0)
    slotText:SetText(itemData.slotName)
    slotText:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    
    -- Item name
    local nameText = row:CreateFontString(nil, "OVERLAY", "DFFontHighlight")
    nameText:SetPoint("LEFT", slotText, "RIGHT", 8, 0)
    if itemInfo and itemInfo.name then
        nameText:SetText(itemInfo.name)
        nameText:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    else
        nameText:SetText("(Empty)")
        nameText:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    end
    
    -- On-Use badge
    if itemInfo and itemInfo.hasOnUse then
        local onUseBadge = row:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
        onUseBadge:SetPoint("LEFT", nameText, "RIGHT", 8, 0)
        onUseBadge:SetText("[USE]")
        onUseBadge:SetTextColor(themeColor.r, themeColor.g, themeColor.b)
    end
    
    -- Check for existing binding - just set border color (no text)
    local bindings = self:GetBindingsForItem(itemData.slot)
    if #bindings > 0 then
        row:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
    end
    
    row.itemData = itemData
    row.existingBindings = bindings
    
    -- Hover
    row:SetScript("OnEnter", function(self)
        self:SetBackdropColor(C_ELEMENT.r + 0.08, C_ELEMENT.g + 0.08, C_ELEMENT.b + 0.08, 1)
        
        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
        if itemInfo then
            GameTooltip:SetInventoryItem("player", itemData.slot)
        else
            GameTooltip:AddLine(itemData.slotName, 1, 1, 1)
            GameTooltip:AddLine(L["No item equipped"], 0.5, 0.5, 0.5)
        end
        
        -- Show existing bindings in tooltip
        local myBindings = self.existingBindings
        if myBindings and #myBindings > 0 then
            GameTooltip:AddLine(" ")
            local bindStrs = {}
            for _, b in ipairs(myBindings) do
                table.insert(bindStrs, CC:GetBindingKeyText(b, true))
            end
            GameTooltip:AddLine(format(L["Bound: %s"], table.concat(bindStrs, ", ")), themeColor.r, themeColor.g, themeColor.b)
        end
        
        GameTooltip:AddLine(" ")
        GameTooltip:AddLine(L["Left-click to add/edit binding"], 0.7, 0.7, 0.7)
        GameTooltip:Show()
    end)
    row:SetScript("OnLeave", function(self)
        self:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
        if #(self.existingBindings or {}) == 0 then
            self:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
        end
        GameTooltip:Hide()
    end)
    
    -- Click to bind
    row:SetScript("OnClick", function(self, button)
        if button == "LeftButton" then
            CC:ShowItemKeybindPopup(itemData)
        end
    end)
    
    return row
end

-- Create a grid cell for a consumable item
function CC:CreateConsumableCell(parent, itemData, index)
    local themeColor = DF.GUI and DF.GUI.GetThemeColor and DF.GUI.GetThemeColor() or {r = 0.2, g = 0.8, b = 0.4}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.6, g = 0.6, b = 0.6}
    
    local cellWidth = 85
    local cellHeight = 75
    
    local cell = CreateFrame("Button", nil, parent, "BackdropTemplate")
    cell:SetSize(cellWidth, cellHeight)
    cell:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    cell:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    cell:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    
    -- Icon
    local iconSize = 40
    local icon = cell:CreateTexture(nil, "ARTWORK")
    icon:SetSize(iconSize, iconSize)
    icon:SetPoint("TOP", 0, -5)
    
    local itemInfo = itemData.itemInfo
    if itemInfo and itemInfo.icon then
        icon:SetTexture(itemInfo.icon)
    else
        icon:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark")
    end
    
    -- Item name
    local nameText = cell:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    nameText:SetPoint("TOP", icon, "BOTTOM", 0, -2)
    nameText:SetPoint("BOTTOM", 0, 3)
    nameText:SetWidth(cellWidth - 4)
    nameText:SetJustifyH("CENTER")
    nameText:SetWordWrap(true)
    nameText:SetMaxLines(2)
    
    if itemInfo and itemInfo.name then
        nameText:SetText(itemInfo.name)
    else
        nameText:SetText(L["Loading..."])
    end
    nameText:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    
    -- Item count
    local count = self:GetItemCount(itemData.itemId)
    if count > 0 then
        local countText = cell:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
        countText:SetPoint("BOTTOMRIGHT", icon, "BOTTOMRIGHT", -2, 2)
        countText:SetText(count)
        countText:SetTextColor(1, 1, 1)
    end
    
    -- Delete button (X)
    local deleteBtn = CreateFrame("Button", nil, cell)
    deleteBtn:SetSize(14, 14)
    deleteBtn:SetPoint("TOPRIGHT", -2, -2)
    local deleteIcon = deleteBtn:CreateTexture(nil, "OVERLAY")
    deleteIcon:SetPoint("CENTER")
    deleteIcon:SetSize(8, 8)
    deleteIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\close")
    deleteIcon:SetVertexColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    deleteBtn:SetScript("OnEnter", function() deleteIcon:SetVertexColor(1, 0.3, 0.3) end)
    deleteBtn:SetScript("OnLeave", function() deleteIcon:SetVertexColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b) end)
    deleteBtn:SetScript("OnClick", function()
        if itemData.savedIndex and self.db.savedConsumables then
            table.remove(self.db.savedConsumables, itemData.savedIndex)
            self:RefreshSpellGrid(true)  -- Skip scroll reset to maintain position
        end
    end)
    
    -- Check for existing binding - just set border color (no text)
    local bindings = self:GetBindingsForConsumable(itemData.itemId)
    if #bindings > 0 then
        cell:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
    end
    
    cell.itemData = itemData
    cell.existingBindings = bindings
    
    -- Hover
    cell:SetScript("OnEnter", function(self)
        self:SetBackdropColor(C_ELEMENT.r + 0.08, C_ELEMENT.g + 0.08, C_ELEMENT.b + 0.08, 1)
        
        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
        if itemData.itemId then
            GameTooltip:SetItemByID(itemData.itemId)
        end
        
        -- Show existing bindings in tooltip
        local myBindings = self.existingBindings
        if myBindings and #myBindings > 0 then
            GameTooltip:AddLine(" ")
            local bindStrs = {}
            for _, b in ipairs(myBindings) do
                table.insert(bindStrs, CC:GetBindingKeyText(b, true))
            end
            GameTooltip:AddLine(format(L["Bound: %s"], table.concat(bindStrs, ", ")), themeColor.r, themeColor.g, themeColor.b)
        end
        
        GameTooltip:AddLine(" ")
        GameTooltip:AddLine(L["Left-click to add/edit binding"], 0.7, 0.7, 0.7)
        GameTooltip:Show()
    end)
    cell:SetScript("OnLeave", function(self)
        self:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
        if #(self.existingBindings or {}) == 0 then
            self:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
        end
        GameTooltip:Hide()
    end)
    
    -- Click to bind
    cell:SetScript("OnClick", function(self, button)
        if button == "LeftButton" then
            CC:ShowConsumableKeybindPopup(itemData)
        end
    end)
    
    return cell
end

-- Create a list row for a consumable item
function CC:CreateConsumableListRow(parent, itemData, index)
    local themeColor = DF.GUI and DF.GUI.GetThemeColor and DF.GUI.GetThemeColor() or {r = 0.2, g = 0.8, b = 0.4}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.6, g = 0.6, b = 0.6}
    
    local containerWidth = self.gridContainer:GetWidth() - 35
    
    local row = CreateFrame("Button", nil, parent, "BackdropTemplate")
    row:SetSize(containerWidth, 36)
    row:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    row:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    row:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    
    -- Icon
    local icon = row:CreateTexture(nil, "ARTWORK")
    icon:SetSize(28, 28)
    icon:SetPoint("LEFT", 4, 0)
    
    local itemInfo = itemData.itemInfo
    if itemInfo and itemInfo.icon then
        icon:SetTexture(itemInfo.icon)
    else
        icon:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark")
    end
    
    -- Item name
    local nameText = row:CreateFontString(nil, "OVERLAY", "DFFontHighlight")
    nameText:SetPoint("LEFT", icon, "RIGHT", 8, 0)
    if itemInfo and itemInfo.name then
        nameText:SetText(itemInfo.name)
    else
        nameText:SetText(L["Loading..."])
    end
    nameText:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    
    -- Item count
    local count = self:GetItemCount(itemData.itemId)
    if count > 0 then
        local countText = row:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
        countText:SetPoint("LEFT", nameText, "RIGHT", 8, 0)
        countText:SetText("(" .. count .. ")")
        countText:SetTextColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    end
    
    -- Delete button
    local deleteBtn = CreateFrame("Button", nil, row)
    deleteBtn:SetSize(20, 20)
    deleteBtn:SetPoint("RIGHT", -4, 0)
    local deleteIcon = deleteBtn:CreateTexture(nil, "OVERLAY")
    deleteIcon:SetPoint("CENTER")
    deleteIcon:SetSize(10, 10)
    deleteIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\close")
    deleteIcon:SetVertexColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b)
    deleteBtn:SetScript("OnEnter", function() deleteIcon:SetVertexColor(1, 0.3, 0.3) end)
    deleteBtn:SetScript("OnLeave", function() deleteIcon:SetVertexColor(C_TEXT_DIM.r, C_TEXT_DIM.g, C_TEXT_DIM.b) end)
    deleteBtn:SetScript("OnClick", function()
        if itemData.savedIndex and self.db.savedConsumables then
            table.remove(self.db.savedConsumables, itemData.savedIndex)
            self:RefreshSpellGrid(true)  -- Skip scroll reset to maintain position
        end
    end)
    
    -- Binding display
    local bindings = self:GetBindingsForConsumable(itemData.itemId)
    if #bindings > 0 then
        local bindText = row:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
        bindText:SetPoint("RIGHT", deleteBtn, "LEFT", -8, 0)
        bindText:SetText(self:GetBindingDisplayText(bindings[1]))
        bindText:SetTextColor(themeColor.r, themeColor.g, themeColor.b)
    end
    
    -- Hover
    row:SetScript("OnEnter", function(self)
        self:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
        if itemData.itemId then
            GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
            GameTooltip:SetItemByID(itemData.itemId)
            GameTooltip:Show()
        end
    end)
    row:SetScript("OnLeave", function(self)
        self:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
        GameTooltip:Hide()
    end)
    
    -- Click to bind
    row:SetScript("OnClick", function(self, button)
        if button == "LeftButton" then
            CC:ShowConsumableKeybindPopup(itemData)
        end
    end)
    
    return row
end

-- Get bindings for an equipment slot
function CC:GetBindingsForItem(slotId)
    local bindings = {}
    if not self.db or not self.db.bindings then return bindings end
    
    for _, binding in ipairs(self.db.bindings) do
        if binding.actionType == self.ACTION_TYPES.ITEM and 
           binding.itemType == "slot" and 
           binding.itemSlot == slotId then
            table.insert(bindings, binding)
        end
    end
    return bindings
end

-- Get bindings for a consumable
function CC:GetBindingsForConsumable(itemId)
    local bindings = {}
    if not self.db or not self.db.bindings then return bindings end
    
    for _, binding in ipairs(self.db.bindings) do
        if binding.actionType == self.ACTION_TYPES.ITEM and 
           binding.itemType == "consumable" and 
           binding.itemId == itemId then
            table.insert(bindings, binding)
        end
    end
    return bindings
end

-- Show keybind popup for equipment slot
function CC:ShowItemKeybindPopup(itemData)
    local itemInfo = itemData.itemInfo
    local displayName = (itemInfo and itemInfo.name) or itemData.slotName
    local displayIcon = (itemInfo and itemInfo.icon) or itemData.defaultIcon
    
    -- Create item data in spell format for the keybind popup
    local itemAsSpell = {
        name = displayName,
        icon = displayIcon,
        isItem = true,
        itemType = "slot",
        itemSlot = itemData.slot,
        slotName = itemData.slotName,
    }
    
    if self.db.options.quickBindEnabled then
        -- Quick bind mode - show simple keybind popup
        self:ShowKeybindPopup(itemAsSpell)
    else
        -- Full edit mode - show edit binding panel
        self:ShowEditBindingPanel(itemAsSpell, nil, nil)
    end
end

-- Show keybind popup for consumable
function CC:ShowConsumableKeybindPopup(itemData)
    local itemInfo = itemData.itemInfo
    local displayName = (itemInfo and itemInfo.name) or "Unknown Item"
    local displayIcon = (itemInfo and itemInfo.icon) or "Interface\\Icons\\INV_Misc_QuestionMark"
    
    local itemAsSpell = {
        name = displayName,
        icon = displayIcon,
        isItem = true,
        itemType = "consumable",
        itemId = itemData.itemId,
    }
    
    if self.db.options.quickBindEnabled then
        -- Quick bind mode - show simple keybind popup
        self:ShowKeybindPopup(itemAsSpell)
    else
        -- Full edit mode - show edit binding panel
        self:ShowEditBindingPanel(itemAsSpell, nil, nil)
    end
end

-- Create a grid cell for a macro
function CC:CreateMacroCell(parent, macroData, index)
    local themeColor = DF.GUI and DF.GUI.GetThemeColor and DF.GUI.GetThemeColor() or {r = 0.2, g = 0.8, b = 0.4}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.6, g = 0.6, b = 0.6}
    
    local cellWidth = 85
    local cellHeight = 75
    
    local cell = CreateFrame("Button", nil, parent, "BackdropTemplate")
    cell:SetSize(cellWidth, cellHeight)
    cell:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    cell:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    cell:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    cell:RegisterForClicks("AnyDown")
    
    -- Try to get icon: auto-detect from body first, then fall back to stored icon
    local iconToUse = nil
    if macroData.body then
        iconToUse = CC:GetIconFromMacroBody(macroData.body)
    end
    if not iconToUse and macroData.icon and type(macroData.icon) == "number" and macroData.icon > 0 then
        iconToUse = macroData.icon
    end
    
    -- Icon
    local icon = cell:CreateTexture(nil, "ARTWORK")
    icon:SetSize(40, 40)
    icon:SetPoint("TOP", 0, -5)
    if iconToUse then
        icon:SetTexture(iconToUse)
        icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
    end
    
    -- Source badge (Cus/Char/Gen)
    local sourceBadge = cell:CreateFontString(nil, "OVERLAY", "DFFontNormalSmall")
    sourceBadge:SetPoint("TOPRIGHT", -3, -3)
    if macroData.source == "global_import" then
        sourceBadge:SetText("[Gen]")
        sourceBadge:SetTextColor(0.6, 0.8, 1)
    elseif macroData.source == "char_import" then
        sourceBadge:SetText("[Char]")
        sourceBadge:SetTextColor(0.8, 0.6, 1)
    else
        sourceBadge:SetText("[Cus]")
        sourceBadge:SetTextColor(1, 0.9, 0.4)
    end
    
    -- Out of sync indicator for imports
    if macroData.source == "global_import" or macroData.source == "char_import" then
        if CC:IsMacroOutOfSync(macroData.id) then
            local syncIcon = cell:CreateFontString(nil, "OVERLAY", "DFFontNormalSmall")
            syncIcon:SetPoint("TOPLEFT", 3, -3)
            syncIcon:SetText("!")
            syncIcon:SetTextColor(1, 0.8, 0)
        end
    end
    
    -- Name
    local name = cell:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    name:SetPoint("TOP", icon, "BOTTOM", 0, -2)
    name:SetPoint("BOTTOM", 0, 3)
    name:SetWidth(cellWidth - 4)
    name:SetText(macroData.name)
    name:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    name:SetWordWrap(true)
    name:SetMaxLines(2)
    
    -- Check for existing binding - just set border color (no text)
    local bindings = CC:GetBindingsForMacro(macroData.id)
    if #bindings > 0 then
        cell:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 0.8)
    end
    
    cell.macroData = macroData
    cell.existingBindings = bindings
    
    -- Hover effects
    cell:SetScript("OnEnter", function(self)
        self:SetBackdropColor(C_ELEMENT.r + 0.08, C_ELEMENT.g + 0.08, C_ELEMENT.b + 0.08, 1)
        
        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
        GameTooltip:AddLine(macroData.name, 1, 1, 1)
        if macroData.source == "global_import" then
            GameTooltip:AddLine(L["General Import"], 0.6, 0.8, 1)
        elseif macroData.source == "char_import" then
            GameTooltip:AddLine(L["Character Import"], 0.8, 0.6, 1)
        else
            GameTooltip:AddLine(L["Custom Macro"], 0.6, 1, 0.6)
        end
        
        -- Show existing bindings in tooltip
        local myBindings = self.existingBindings
        if myBindings and #myBindings > 0 then
            GameTooltip:AddLine(" ")
            local bindStrs = {}
            for _, b in ipairs(myBindings) do
                table.insert(bindStrs, CC:GetBindingKeyText(b, true))
            end
            GameTooltip:AddLine(format(L["Bound: %s"], table.concat(bindStrs, ", ")), themeColor.r, themeColor.g, themeColor.b)
        end
        
        GameTooltip:AddLine(" ")
        -- Show first 100 chars of body
        local bodyPreview = macroData.body or ""
        if #bodyPreview > 100 then
            bodyPreview = bodyPreview:sub(1, 100) .. "..."
        end
        GameTooltip:AddLine(bodyPreview, 0.7, 0.7, 0.7, true)
        GameTooltip:AddLine(" ")
        GameTooltip:AddLine(L["Left-click: Bind"], 0.5, 0.5, 0.5)
        GameTooltip:AddLine(L["Right-click: Edit/View"], 0.5, 0.5, 0.5)
        GameTooltip:Show()
    end)
    
    cell:SetScript("OnLeave", function(self)
        self:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
        GameTooltip:Hide()
    end)
    
    cell:SetScript("OnClick", function(self, button)
        if button == "LeftButton" then
            -- Bind this macro
            CC:ShowKeybindPopupForMacro(macroData)
        elseif button == "RightButton" then
            -- Edit/view macro
            CC:ShowMacroEditorDialog(macroData)
        end
    end)
    
    return cell
end

-- Create a list row for a macro
function CC:CreateMacroListRow(parent, macroData, index)
    local themeColor = DF.GUI and DF.GUI.GetThemeColor and DF.GUI.GetThemeColor() or {r = 0.2, g = 0.8, b = 0.4}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.6, g = 0.6, b = 0.6}
    
    local containerWidth = self.gridContainer:GetWidth() - 35
    local rowHeight = 28
    
    local row = CreateFrame("Button", nil, parent, "BackdropTemplate")
    row:SetSize(containerWidth, rowHeight)
    row:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    row:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
    row:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    row:RegisterForClicks("AnyDown")
    
    -- Try to get icon: auto-detect from body first, then fall back to stored icon
    local iconToUse = nil
    if macroData.body then
        iconToUse = CC:GetIconFromMacroBody(macroData.body)
    end
    if not iconToUse and macroData.icon and type(macroData.icon) == "number" and macroData.icon > 0 then
        iconToUse = macroData.icon
    end
    
    -- Icon
    local icon = row:CreateTexture(nil, "ARTWORK")
    icon:SetSize(22, 22)
    icon:SetPoint("LEFT", 4, 0)
    if iconToUse then
        icon:SetTexture(iconToUse)
        icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
    end
    
    -- Source badge (Cus/Char/Gen)
    local sourceBadge = row:CreateFontString(nil, "OVERLAY", "DFFontNormalSmall")
    sourceBadge:SetPoint("LEFT", icon, "RIGHT", 6, 0)
    if macroData.source == "global_import" then
        sourceBadge:SetText("[Gen]")
        sourceBadge:SetTextColor(0.6, 0.8, 1)
    elseif macroData.source == "char_import" then
        sourceBadge:SetText("[Char]")
        sourceBadge:SetTextColor(0.8, 0.6, 1)
    else
        sourceBadge:SetText("[Cus]")
        sourceBadge:SetTextColor(1, 0.9, 0.4)
    end
    
    -- Name
    local name = row:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    name:SetPoint("LEFT", sourceBadge, "RIGHT", 6, 0)
    name:SetText(macroData.name)
    name:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    
    -- Check for existing binding - just set border color (no text like spells)
    local bindings = CC:GetBindingsForMacro(macroData.id)
    if #bindings > 0 then
        row:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 0.8)
    end
    
    row.macroData = macroData
    row.existingBindings = bindings
    
    -- Sync warning for imports
    if (macroData.source == "global_import" or macroData.source == "char_import") and CC:IsMacroOutOfSync(macroData.id) then
        local syncIcon = row:CreateFontString(nil, "OVERLAY", "DFFontNormalSmall")
        syncIcon:SetPoint("RIGHT", -8, 0)
        syncIcon:SetText("⚠")
        syncIcon:SetTextColor(1, 0.8, 0)
    end
    
    -- Hover effects
    row:SetScript("OnEnter", function(self)
        self:SetBackdropColor(C_ELEMENT.r + 0.08, C_ELEMENT.g + 0.08, C_ELEMENT.b + 0.08, 1)
        
        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
        GameTooltip:AddLine(macroData.name, 1, 1, 1)
        if macroData.source == "global_import" then
            GameTooltip:AddLine(L["General Import"], 0.6, 0.8, 1)
        elseif macroData.source == "char_import" then
            GameTooltip:AddLine(L["Character Import"], 0.8, 0.6, 1)
        else
            GameTooltip:AddLine(L["Custom Macro"], 0.6, 1, 0.6)
        end
        
        -- Show existing bindings in tooltip
        local myBindings = self.existingBindings
        if myBindings and #myBindings > 0 then
            GameTooltip:AddLine(" ")
            local bindStrs = {}
            for _, b in ipairs(myBindings) do
                table.insert(bindStrs, CC:GetBindingKeyText(b, true))
            end
            GameTooltip:AddLine(format(L["Bound: %s"], table.concat(bindStrs, ", ")), themeColor.r, themeColor.g, themeColor.b)
        end
        
        GameTooltip:AddLine(" ")
        local bodyPreview = macroData.body or ""
        if #bodyPreview > 100 then
            bodyPreview = bodyPreview:sub(1, 100) .. "..."
        end
        GameTooltip:AddLine(bodyPreview, 0.7, 0.7, 0.7, true)
        GameTooltip:AddLine(" ")
        GameTooltip:AddLine(L["Left-click: Bind"], 0.5, 0.5, 0.5)
        GameTooltip:AddLine(L["Right-click: Edit/View"], 0.5, 0.5, 0.5)
        GameTooltip:Show()
    end)
    
    row:SetScript("OnLeave", function(self)
        self:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 1)
        GameTooltip:Hide()
    end)
    
    row:SetScript("OnClick", function(self, button)
        if button == "LeftButton" then
            CC:ShowKeybindPopupForMacro(macroData)
        elseif button == "RightButton" then
            CC:ShowMacroEditorDialog(macroData)
        end
    end)
    
    return row
end

-- Show keybind popup for a macro
function CC:ShowKeybindPopupForMacro(macroData)
    if not macroData then return end
    
    local macroInfo = {
        name = macroData.name,
        icon = macroData.icon or "Interface\\Icons\\INV_Misc_QuestionMark",
        isMacro = true,
        macroId = macroData.id,
    }
    
    if self.db.options.quickBindEnabled then
        -- Quick bind mode - show simple keybind popup
        self.pendingMacroBinding = macroData
        self:ShowKeybindPopup(macroInfo)
    else
        -- Full edit mode - show edit binding panel
        self:ShowEditBindingPanel(macroInfo, nil, nil)
    end
end

-- Create a list row for a spell
function CC:CreateSpellListRow(parent, spellData, index, isSpecialAction, actionType)
    local themeColor = {r = 0.2, g = 0.8, b = 0.4}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local C_TEXT_DIM = {r = 0.6, g = 0.6, b = 0.6}
    local specialColor = {r = 0.6, g = 0.6, b = 0.9}
    
    local containerWidth = self.gridContainer:GetWidth() - 35
    local rowHeight = 28
    
    local row = CreateFrame("Button", nil, parent, "BackdropTemplate")
    row:SetSize(containerWidth, rowHeight)
    row:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    
    if isSpecialAction then
        row:SetBackdropColor(specialColor.r * 0.15, specialColor.g * 0.15, specialColor.b * 0.15, 0.8)
        row:SetBackdropBorderColor(specialColor.r * 0.5, specialColor.g * 0.5, specialColor.b * 0.5, 0.8)
    else
        row:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 0.8)
        row:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 0.5)
    end
    row:RegisterForClicks("AnyDown")
    
    -- Get display info - use displayName from spell data if available (already has override applied)
    local displayName, displayIcon, displaySpellId
    if not isSpecialAction and spellData.spellId then
        -- Always get displaySpellId from GetSpellDisplayInfo for proper override detection
        displayName, displayIcon, displaySpellId = GetSpellDisplayInfo(spellData.spellId, spellData.name)
        
        -- Use displayName from spell data if available (already has override applied)
        if spellData.displayName then
            displayName = spellData.displayName
        end
        if spellData.icon then
            displayIcon = spellData.icon
        end
    else
        displayName = spellData.name
        displayIcon = spellData.icon
        displaySpellId = spellData.spellId
    end
    
    -- Icon (use current display icon)
    local icon = row:CreateTexture(nil, "ARTWORK")
    icon:SetPoint("LEFT", 6, 0)
    icon:SetSize(22, 22)
    icon:SetTexture(displayIcon or spellData.icon)
    if not isSpecialAction then
        icon:SetTexCoord(0.08, 0.92, 0.08, 0.92)
    end
    
    -- Name (use current display name)
    local name = row:CreateFontString(nil, "OVERLAY", "DFFontNormal")
    name:SetPoint("LEFT", icon, "RIGHT", 8, 0)
    name:SetText(displayName or spellData.name)
    if isSpecialAction then
        name:SetTextColor(specialColor.r, specialColor.g, specialColor.b)
    else
        name:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
    end
    
    -- Check for existing binding - just set border color, no text display
    -- Pass displaySpellId to match bindings that resolve to the same displayed spell
    local existingBindings
    if isSpecialAction then
        existingBindings = CC:GetBindingsForAction(actionType)
    else
        existingBindings = CC:GetBindingsForSpell(spellData.name, displaySpellId)
    end
    
    if #existingBindings > 0 then
        if isSpecialAction then
            row:SetBackdropBorderColor(specialColor.r, specialColor.g, specialColor.b, 1)
        else
            row:SetBackdropBorderColor(themeColor.r, themeColor.g, themeColor.b, 1)
        end
    end
    
    row.spellData = spellData
    row.existingBindings = existingBindings
    row.isSpecialAction = isSpecialAction
    row.actionType = actionType
    row.displaySpellId = displaySpellId  -- Store for tooltip
    
    -- Hover effects
    row:SetScript("OnEnter", function(self)
        if isSpecialAction then
            self:SetBackdropColor(specialColor.r * 0.25, specialColor.g * 0.25, specialColor.b * 0.25, 1)
        else
            self:SetBackdropColor(themeColor.r * 0.3, themeColor.g * 0.3, themeColor.b * 0.3, 1)
        end
        
        -- Tooltip (use current override spell ID for accurate tooltip)
        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
        if isSpecialAction then
            GameTooltip:SetText(spellData.name)
        else
            GameTooltip:SetSpellByID(self.displaySpellId or spellData.spellId)
        end
        
        -- Show existing bindings in tooltip if any
        local bindings = self.existingBindings
        if bindings and #bindings > 0 then
            GameTooltip:AddLine(" ")
            local bindStrs = {}
            for _, b in ipairs(bindings) do
                table.insert(bindStrs, CC:GetBindingKeyText(b, true))
            end
            local bindColor = isSpecialAction and specialColor or themeColor
            GameTooltip:AddLine(format(L["Bound: %s"], table.concat(bindStrs, ", ")), bindColor.r, bindColor.g, bindColor.b)
        end
        
        GameTooltip:AddLine(" ")
        GameTooltip:AddLine(L["Left-click to add/edit binding"], 0.7, 0.7, 0.7)
        GameTooltip:Show()
    end)
    
    row:SetScript("OnLeave", function(self)
        if isSpecialAction then
            self:SetBackdropColor(specialColor.r * 0.15, specialColor.g * 0.15, specialColor.b * 0.15, 0.8)
        else
            self:SetBackdropColor(C_ELEMENT.r, C_ELEMENT.g, C_ELEMENT.b, 0.8)
        end
        GameTooltip:Hide()
    end)
    
    -- Click handler
    row:SetScript("OnClick", function(self, button)
        if button == "LeftButton" then
            local info
            if isSpecialAction then
                info = {
                    actionType = actionType,
                    name = spellData.name,
                    icon = spellData.icon,
                }
            else
                info = {
                    spellName = spellData.name,
                    spellId = spellData.spellId,
                    name = spellData.name,
                    icon = spellData.icon,
                }
            end
            
            if CC.db.options.quickBindEnabled then
                -- Quick bind mode
                CC:ShowKeybindPopup(info)
            else
                -- Full edit mode
                CC:ShowEditBindingPanel(info, nil, nil)
            end
        end
    end)
    
    return row
end

function CC:CreateSpecialActionCell(parent, actionType, label, iconPath)
    local themeColor = {r = 0.2, g = 0.8, b = 0.4}
    local C_ELEMENT = {r = 0.18, g = 0.18, b = 0.18}
    local C_BORDER = {r = 0.25, g = 0.25, b = 0.25}
    local C_TEXT = {r = 0.9, g = 0.9, b = 0.9}
    local specialColor = {r = 0.6, g = 0.6, b = 0.9} -- Purple-ish for special actions
    
    local cellWidth = 85
    local cellHeight = 75
    
    local cell = CreateFrame("Button", nil, parent, "BackdropTemplate")
    cell:SetSize(cellWidth, cellHeight)
    cell:SetBackdrop({
        bgFile = "Interface\\Buttons\\WHITE8x8",
        edgeFile = "Interface\\Buttons\\WHITE8x8",
        edgeSize = 1,
    })
    cell:SetBackdropColor(specialColor.r * 0.15, specialColor.g * 0.15, specialColor.b * 0.15, 0.8)
    cell:SetBackdropBorderColor(specialColor.r * 0.5, specialColor.g * 0.5, specialColor.b * 0.5, 0.8)
    cell:RegisterForClicks("AnyDown")
    
    -- Icon (larger now)
    local icon = cell:CreateTexture(nil, "ARTWORK")
    icon:SetPoint("TOP", 0, -5)
    icon:SetSize(40, 40)
    icon:SetTexture(iconPath)
    
    -- Name
    local name = cell:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
    name:SetPoint("TOP", icon, "BOTTOM", 0, -2)
    name:SetPoint("BOTTOM", 0, 3)
    name:SetWidth(cellWidth - 4)
    name:SetText(label)
    name:SetTextColor(specialColor.r, specialColor.g, specialColor.b)
    name:SetWordWrap(true)
    name:SetMaxLines(2)
    
    -- Check for existing binding - just set border, no text
    local existingBindings = {}
    for i, binding in ipairs(self.db.bindings) do
        if binding.actionType == actionType then
            table.insert(existingBindings, binding)
        end
    end
    
    if #existingBindings > 0 then
        cell:SetBackdropBorderColor(specialColor.r, specialColor.g, specialColor.b, 1)
    end
    
    cell.actionType = actionType
    cell.existingBindings = existingBindings
    
    -- Hover effects
    cell:SetScript("OnEnter", function(self)
        self:SetBackdropColor(specialColor.r * 0.4, specialColor.g * 0.4, specialColor.b * 0.4, 1)
        
        GameTooltip:SetOwner(self, "ANCHOR_RIGHT")
        GameTooltip:SetText(label)
        
        -- Show existing bindings in tooltip if any
        local bindings = self.existingBindings
        if bindings and #bindings > 0 then
            GameTooltip:AddLine(" ")
            local bindStrs = {}
            for _, b in ipairs(bindings) do
                table.insert(bindStrs, CC:GetBindingKeyText(b, true))
            end
            GameTooltip:AddLine(format(L["Bound: %s"], table.concat(bindStrs, ", ")), specialColor.r, specialColor.g, specialColor.b)
        end
        
        GameTooltip:AddLine(" ")
        GameTooltip:AddLine(L["Left-click to add/edit binding"], 0.7, 0.7, 0.7)
        GameTooltip:Show()
    end)
    
    cell:SetScript("OnLeave", function(self)
        self:SetBackdropColor(specialColor.r * 0.15, specialColor.g * 0.15, specialColor.b * 0.15, 0.8)
        GameTooltip:Hide()
    end)
    
    -- Click handlers
    cell:SetScript("OnClick", function(self, button)
        if button == "LeftButton" then
            local actionInfo = {
                actionType = actionType,
                name = label,
                icon = iconPath,
            }
            
            if CC.db.options.quickBindEnabled then
                -- Quick bind mode - show simple keybind popup
                CC:ShowKeybindPopup(actionInfo)
            else
                -- Full edit mode - show edit binding panel
                CC:ShowEditBindingPanel(actionInfo, nil, nil)
            end
        end
    end)
    
    return cell
end

-- Initialize when player enters world (deferred from ADDON_LOADED for faster load times)
local initFrame = CreateFrame("Frame")
initFrame:RegisterEvent("PLAYER_ENTERING_WORLD")
initFrame:SetScript("OnEvent", function(self, event, isInitialLogin, isReloadingUi)
    -- Only initialize on first load or reload, not zone changes
    if isInitialLogin or isReloadingUi then
        CC:Initialize()
        self:UnregisterEvent("PLAYER_ENTERING_WORLD")
    end
end)

-- Debug slash command to list all detected spells
SLASH_DFCCSPELLS1 = "/dfccspells"
SlashCmdList["DFCCSPELLS"] = function(msg)
    if msg == "raw" then
        -- Dump raw spellbook data with item types
        print("|cff00ff00DandersFrames:|r Raw spellbook dump:")
        local bookType = Enum.SpellBookSpellBank.Player
        local numTabs = C_SpellBook.GetNumSpellBookSkillLines()
        
        -- Map item types to names
        local typeNames = {
            [Enum.SpellBookItemType.Spell] = "Spell",
            [Enum.SpellBookItemType.FutureSpell] = "FutureSpell",
            [Enum.SpellBookItemType.PetAction] = "PetAction",
            [Enum.SpellBookItemType.Flyout] = "Flyout",
        }
        
        for tabIndex = 1, numTabs do
            local skillLineInfo = C_SpellBook.GetSpellBookSkillLineInfo(tabIndex)
            if skillLineInfo and not skillLineInfo.shouldHide then
                local offset = skillLineInfo.itemIndexOffset
                local numSlots = skillLineInfo.numSpellBookItems
                local tabName = skillLineInfo.name or "Unknown"
                
                print("|cff00ff00Tab: " .. tabName .. "|r (" .. numSlots .. " slots)")
                
                for i = 1, numSlots do
                    local slotIndex = offset + i
                    local spellBookItemInfo = C_SpellBook.GetSpellBookItemInfo(slotIndex, bookType)
                    
                    if spellBookItemInfo then
                        local itemType = spellBookItemInfo.itemType
                        local spellId = spellBookItemInfo.spellID
                        local typeName = typeNames[itemType] or ("Unknown:" .. tostring(itemType))
                        local isPassive = C_SpellBook.IsSpellBookItemPassive(slotIndex, bookType)
                        local isKnown = spellId and C_SpellBook.IsSpellInSpellBook and 
                            C_SpellBook.IsSpellInSpellBook(spellId, bookType, true)
                        
                        local spellName = "?"
                        if spellId then
                            local spellInfo = C_Spell.GetSpellInfo(spellId)
                            if spellInfo then
                                spellName = spellInfo.name
                            end
                        end
                        
                        local flags = ""
                        if isPassive then flags = flags .. " [Passive]" end
                        if not isKnown then flags = flags .. " [NotKnown]" end
                        
                        print("  " .. typeName .. ": " .. spellName .. " (ID:" .. (spellId or "nil") .. ")" .. flags)
                    end
                end
            end
        end
    elseif msg == "types" then
        -- Just show counts by type
        print("|cff00ff00DandersFrames:|r Spell counts by type:")
        local bookType = Enum.SpellBookSpellBank.Player
        local numTabs = C_SpellBook.GetNumSpellBookSkillLines()
        local typeCounts = {}
        local notKnownCount = 0
        local passiveCount = 0
        
        for tabIndex = 1, numTabs do
            local skillLineInfo = C_SpellBook.GetSpellBookSkillLineInfo(tabIndex)
            if skillLineInfo and not skillLineInfo.shouldHide then
                local offset = skillLineInfo.itemIndexOffset
                local numSlots = skillLineInfo.numSpellBookItems
                
                for i = 1, numSlots do
                    local slotIndex = offset + i
                    local spellBookItemInfo = C_SpellBook.GetSpellBookItemInfo(slotIndex, bookType)
                    
                    if spellBookItemInfo then
                        local itemType = spellBookItemInfo.itemType
                        typeCounts[itemType] = (typeCounts[itemType] or 0) + 1
                        
                        local spellId = spellBookItemInfo.spellID
                        if spellId and C_SpellBook.IsSpellInSpellBook and 
                            not C_SpellBook.IsSpellInSpellBook(spellId, bookType, true) then
                            notKnownCount = notKnownCount + 1
                        end
                        if C_SpellBook.IsSpellBookItemPassive(slotIndex, bookType) then
                            passiveCount = passiveCount + 1
                        end
                    end
                end
            end
        end
        
        local typeNames = {
            [Enum.SpellBookItemType.Spell] = "Spell",
            [Enum.SpellBookItemType.FutureSpell] = "FutureSpell", 
            [Enum.SpellBookItemType.PetAction] = "PetAction",
            [Enum.SpellBookItemType.Flyout] = "Flyout",
        }
        
        for itemType, count in pairs(typeCounts) do
            local name = typeNames[itemType] or ("Unknown:" .. tostring(itemType))
            print("  " .. name .. ": " .. count)
        end
        print("  Passive: " .. passiveCount)
        print("  NotKnown: " .. notKnownCount)
        
    elseif msg == "list" then
        local spells = CC:GetAllPlayerSpells()
        local byCategory = {}
        for _, spell in ipairs(spells) do
            local cat = spell.tabName or "Unknown"
            if not byCategory[cat] then
                byCategory[cat] = {}
            end
            table.insert(byCategory[cat], spell.name)
        end
        
        for cat, names in pairs(byCategory) do
            print("|cff00ff00" .. cat .. ":|r " .. #names .. " spells")
            for _, name in ipairs(names) do
                print("  - " .. name)
            end
        end
    else
        local spells = CC:GetAllPlayerSpells()
        print("|cff00ff00DandersFrames:|r Found " .. #spells .. " spells")
        print("Commands:")
        print("  |cff00ff00/dfccspells list|r - Show included spells by category")
        print("  |cff00ff00/dfccspells types|r - Show counts by spell type")
        print("  |cff00ff00/dfccspells raw|r - Dump all spellbook entries with types")
    end
end

-- Test slash command for Mac warning popup
SLASH_DFCCMACTEST1 = "/dfccmactest"
SlashCmdList["DFCCMACTEST"] = function()
    local isMac = IsMacClient and IsMacClient() or false
    print("|cff33cc66[DF Click Casting]|r Mac warning test:")
    print("  IsMacClient() = " .. tostring(isMac))
    
    -- Show the popup warning
    CC:ShowMacMetaClickWarning()
    
    -- Open the click casting UI if needed
    if not CC.clickCastUIFrame or not CC.clickCastUIFrame:IsShown() then
        CC:ToggleClickCastUI()
    end
    
    -- Open the edit binding panel with a dummy spell to see the warning
    local dummySpell = {
        spellName = "Test Spell",
        name = "Test Spell",
        icon = 136243,  -- Generic spell icon
    }
    CC:ShowEditBindingPanel(dummySpell, nil, nil)
    
    -- Force show the Mac warning in the edit panel
    if CC.editBindingPanel and CC.editBindingPanel.macWarning then
        CC.editBindingPanel.macWarning:Show()
        print("  Showing warning in Edit Binding Panel")
    end
    
    -- Also show quick bind popup to test that warning (just the visual, no capture)
    C_Timer.After(0.5, function()
        if CC.keybindPopup then
            -- Show just the popup visually (not the capture frame)
            CC.keybindPopup.title:SetText("Quick Bind Test")
            CC.keybindPopup.spellName:SetText("Test Spell")
            CC.keybindPopup:ClearAllPoints()
            CC.keybindPopup:SetPoint("CENTER", UIParent, "CENTER", 250, 0)
            CC.keybindPopup:Show()
            
            -- Force show the Mac warning
            if CC.keybindPopup.macWarning then
                CC.keybindPopup.macWarning:Show()
                print("  Showing warning in Quick Bind Popup (positioned to the right)")
                print("  Note: Quick bind popup is display-only for this test")
            end
        end
    end)
end

-- ============================================================