sync

kawre · kawre · commit 575c8585fc28 · 2024-12-02T17:32:07.000+01:00
diff --git a/lua/leetcode/config/init.lua b/lua/leetcode/config/init.lua
@@ -3,7 +3,7 @@ local P = require("plenary.path")
 
 _Lc_state = {
     menu = nil, ---@type lc.ui.Menu
-    questions = {}, ---@type lc.ui.Question[]
+    questions = {}, ---@type leet.ui.Problem[]
 }
 
 local lazy_plugs = {}
diff --git a/lua/leetcode/ui/menu/button/back.lua b/lua/leetcode/ui/menu/button/back.lua
@@ -1,13 +1,15 @@
 local Button = require("leetcode.ui.menu.button")
 local markup = require("markup")
 
-return markup.Component(function(self)
-    local page = self.props
+return markup.Component({
+    render = function(self)
+        local page = self.props
 
-    return Button({
-        icon = "",
-        title = "Back",
-        key = "q",
-        page = page,
-    })
-end)
+        return Button({
+            icon = "",
+            title = "Back",
+            key = "q",
+            page = page,
+        })
+    end,
+})
diff --git a/lua/leetcode/ui/menu/button/init.lua b/lua/leetcode/ui/menu/button/init.lua
@@ -4,15 +4,6 @@ local log = require("leetcode.logger")
 return markup.Component(function(self)
     local p = self.props
 
-    local left = {
-        markup.Inline(p.icon, "leetcode_menu_button_icon"),
-        markup.Inline(p.title, "leetcode_menu_button_title"),
-    }
-
-    if p.nested then
-        table.insert(left, markup.Inline("", "leetcode_menu_button_nested"))
-    end
-
     local on_submit = p.page and function()
         _Lc_state.menu:set_page(p.page)
     end or p.on_submit
@@ -26,7 +17,11 @@ return markup.Component(function(self)
             markup.HFlex({
                 spacing = 1,
                 size = { width = 50 },
-                children = left,
+                children = {
+                    markup.Inline(p.icon, "leetcode_menu_button_icon"),
+                    markup.Inline(p.title, "leetcode_menu_button_title"),
+                    markup.If(p.nested, markup.Inline("", "leetcode_menu_button_nested")),
+                },
             }),
             markup.Inline(p.key, "leetcode_menu_button_key"),
         },
diff --git a/lua/leetcode/ui/menu/buttons.lua b/lua/leetcode/ui/menu/buttons.lua
@@ -1,5 +1,4 @@
 local markup = require("markup")
-local log = require("leetcode.logger")
 
 return markup.Component(function(self)
     return markup.Flex({
diff --git a/lua/leetcode/ui/menu/footer.lua b/lua/leetcode/ui/menu/footer.lua
@@ -1,9 +1,9 @@
 local markup = require("markup")
 local config = require("leetcode.config")
 
-return function()
+return markup.Component(function()
     return markup.Inline({
         markup.Inline("signed in as: ", "leetcode_menu_footer"),
         markup.Inline(config.auth.name or "no user", "leetcode_menu_footer_username"),
     })
-end
+end)
diff --git a/lua/leetcode/ui/menu/header.lua b/lua/leetcode/ui/menu/header.lua
@@ -11,6 +11,6 @@ local ascii = {
     [[|________/\_______/\_______/  \___/  \______/ \______/ \_______/\_______/]],
 }
 
-return function()
+return markup.Component(function()
     return markup.Block(vim.tbl_map(markup.Block, ascii), "leetcode_menu_header")
-end
+end)
diff --git a/lua/leetcode/ui/menu/init.lua b/lua/leetcode/ui/menu/init.lua
@@ -25,20 +25,18 @@ function Menu:set_page(page)
 end
 
 function Menu:render()
-    self:set_body({
+    Menu.super.render(self, {
         markup.Flex({
             margin = { top = 3 },
             align = "center",
             spacing = 3,
             children = {
                 Header(),
-                Nav({ page = self.page }),
+                Nav(self.page),
                 Footer(),
             },
         }),
     })
-
-    Menu.super.render(self)
 end
 
 function Menu:draw()
diff --git a/lua/leetcode/ui/menu/nav/init.lua b/lua/leetcode/ui/menu/nav/init.lua
@@ -2,14 +2,14 @@ local markup = require("markup")
 local Title = require("leetcode.ui.menu.title")
 
 return markup.Component(function(self)
-    local page = self.props.page
+    local page = self.props
     local Items = require("leetcode.ui.menu.nav." .. page)
 
     return markup.Flex({
         spacing = 1,
         align = "center",
         children = {
-            Title({ page = page }),
+            Title(page),
             Items(),
         },
     })
diff --git a/lua/leetcode/ui/menu/nav/loading.lua b/lua/leetcode/ui/menu/nav/loading.lua
@@ -1,7 +1,5 @@
 local markup = require("markup")
 
-return markup.Component({
-    render = function()
-        return markup.Inline("loading...")
-    end,
-})
+return markup.Component(function()
+    return markup.Inline("loading...")
+end)
diff --git a/lua/leetcode/ui/menu/nav/menu/init.lua b/lua/leetcode/ui/menu/nav/menu/init.lua
@@ -5,41 +5,42 @@ local Button = require("leetcode.ui.menu.button")
 
 return markup.Component(function()
     return Buttons({
-        Button({
-            icon = "",
-            title = "Problems",
-            key = "p",
-            nested = true,
-            page = "menu.problems",
-        }),
-        Button({
-            icon = "",
-            title = "Statistics",
-            key = "s",
-            nested = true,
-            page = "menu.statistics",
-        }),
-        Button({
-            icon = "󰆘",
-            title = "Cookie",
-            key = "i",
-            nested = true,
-            page = "menu.cookie",
-        }),
-        Button({
-            icon = "",
-            title = "Cache",
-            key = "c",
-            nested = true,
-            page = "menu.cache",
-        }),
-        Button({
-            icon = "󰩈",
-            title = "Exit",
-            key = "q",
-            on_submit = function()
-                require("leetcode").stop()
-            end,
-        }),
+        markup.Inline("123"),
+        --     -- Button({
+        --     --     icon = "",
+        --     --     title = "Problems",
+        --     --     key = "p",
+        --     --     nested = true,
+        --     --     page = "menu.problems",
+        --     -- }),
+        --     -- Button({
+        --     --     icon = "",
+        --     --     title = "Statistics",
+        --     --     key = "s",
+        --     --     nested = true,
+        --     --     page = "menu.statistics",
+        --     -- }),
+        --     -- Button({
+        --     --     icon = "󰆘",
+        --     --     title = "Cookie",
+        --     --     key = "i",
+        --     --     nested = true,
+        --     --     page = "menu.cookie",
+        --     -- }),
+        --     -- Button({
+        --     --     icon = "",
+        --     --     title = "Cache",
+        --     --     key = "c",
+        --     --     nested = true,
+        --     --     page = "menu.cache",
+        --     -- }),
+        --     -- Button({
+        --     --     icon = "󰩈",
+        --     --     title = "Exit",
+        --     --     key = "q",
+        --     --     on_submit = function()
+        --     --         require("leetcode").stop()
+        --     --     end,
+        --     -- }),
     })
 end)
diff --git a/lua/leetcode/ui/menu/nav/menu/statistics/init.lua b/lua/leetcode/ui/menu/nav/menu/statistics/init.lua
@@ -3,11 +3,21 @@ local Buttons = require("leetcode.ui.menu.buttons")
 local Button = require("leetcode.ui.menu.button")
 local BackButton = require("leetcode.ui.menu.button.back")
 local config = require("leetcode.config")
+local log = require("leetcode.logger")
 
-return markup.Component(function()
+return markup.Component(function(self)
     local cmd = require("leetcode.command")
 
-    local buttons = {
+    return Buttons({
+        markup.If(
+            not self.state.expanded,
+            Button({
+                title = "Skills",
+                icon = "",
+                key = "s",
+                on_submit = cmd.ui_skills,
+            })
+        ),
         Button({
             icon = "",
             title = "Languages",
@@ -21,17 +31,5 @@ return markup.Component(function()
             on_submit = function() end,
         }),
         BackButton("menu"),
-    }
-
-    if not config.is_cn then
-        local skills = Button({
-            title = "Skills",
-            icon = "",
-            key = "s",
-            on_submit = cmd.ui_skills,
-        })
-        table.insert(buttons, 1, skills)
-    end
-
-    return Buttons(buttons)
+    })
 end)
diff --git a/lua/leetcode/ui/menu/title.lua b/lua/leetcode/ui/menu/title.lua
@@ -1,7 +1,7 @@
 local markup = require("markup")
 
 return markup.Component(function(self)
-    local page = self.props.page
+    local page = self.props
 
     local titles = {}
     local parts = vim.split(page, ".", { plain = true })
diff --git a/lua/leetcode/ui/problem/description/init.lua b/lua/leetcode/ui/problem/description/init.lua
@@ -19,22 +19,21 @@ function Description:init(problem)
         },
         win_opts = {
             wrap = true,
+            winhighlight = "Normal:MarkupNormalFloat,FloatBorder:MarkupFloatBorder",
         },
     })
 
     self.problem = problem
-    self:build()
 end
 
-function Description:build()
-    self:set_body({
+function Description:render()
+    Description.super.render(self, {
         Header({
             cache = self.problem.cache,
             info = self.problem.q,
         }),
         Content(utils.translate(self.problem.q.content, self.problem.q.translated_content)),
     })
-    self:render()
 end
 
 -- function Description:
diff --git a/lua/leetcode/ui/problem/info/init.lua b/lua/leetcode/ui/problem/info/init.lua
@@ -29,7 +29,6 @@ function ProblemInfo:init(problem)
         enter = true,
     })
     self.problem = problem
-    self:build()
 end
 
 function ProblemInfo:build_hints()
@@ -105,16 +104,18 @@ function ProblemInfo:build_similar_questions()
     })
 end
 
-function ProblemInfo:build()
-    self:set_body(markup.Flex({
-        spacing = 2,
-        children = {
-            self:build_hints(),
-            self:build_tags(),
-            self:build_similar_questions(),
-        },
-    }))
-    -- self:render()
+function ProblemInfo:render()
+    ProblemInfo.super.render(
+        self,
+        markup.Flex({
+            spacing = 2,
+            children = {
+                self:build_hints(),
+                self:build_tags(),
+                self:build_similar_questions(),
+            },
+        })
+    )
 end
 
 return ProblemInfo
diff --git a/lua/leetcode/utils.lua b/lua/leetcode/utils.lua
@@ -34,24 +34,13 @@ function utils.question_tabs()
     local questions = {}
 
     for _, q in ipairs(_Lc_state.questions) do
-        local tabp = utils.question_tabp(q)
-        if tabp then
-            table.insert(questions, { tabpage = tabp, question = q })
-        end
+        local tabp = q.tabpage
+        table.insert(questions, { tabpage = tabp, question = q })
     end
 
     return questions
 end
 
----@param q lc.ui.Question
----@return integer|nil
-function utils.question_tabp(q)
-    local ok, tabp = pcall(vim.api.nvim_win_get_tabpage, q.winid)
-    if ok then
-        return tabp
-    end
-end
-
 ---@return lc.ui.Question
 function utils.curr_question()
     local tabp = vim.api.nvim_get_current_tabpage()

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ local P = require("plenary.path")`
`3`	`3`
`4`	`4`	`_Lc_state = {`
`5`	`5`	`menu = nil, ---@type lc.ui.Menu`
`6`		`- questions = {}, ---@type lc.ui.Question[]`
	`6`	`+ questions = {}, ---@type leet.ui.Problem[]`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`local lazy_plugs = {}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`local markup = require("markup")`
`2`		`-local log = require("leetcode.logger")`
`3`	`2`
`4`	`3`	`return markup.Component(function(self)`
`5`	`4`	`return markup.Flex({`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ local ascii = {`
`11`	`11`	`[[\|________/\_______/\_______/ \___/ \______/ \______/ \_______/\_______/]],`
`12`	`12`	`}`
`13`	`13`
`14`		`-return function()`
	`14`	`+return markup.Component(function()`
`15`	`15`	`return markup.Block(vim.tbl_map(markup.Block, ascii), "leetcode_menu_header")`
`16`		`-end`
	`16`	`+end)`