Skip to content

fix: rendering fails when no file type style is matched #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sxyazi merged 3 commits into from
Feb 24, 2024
Merged

fix: rendering fails when no file type style is matched #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf1305b
fix: rendering fails when no file type style is matched
sxyazi Feb 24, 2024
e31abe1
..
sxyazi Feb 24, 2024
6bde9ce
..
sxyazi Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions yazi-fm/src/lives/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,13 @@ impl File {
})
});
reg.add_method("is_selected", |_, me, ()| Ok(me.tab().selected.contains(&me.url)));
reg.add_method("in_parent", |_, me, ()| {
Ok(me.tab().parent.as_ref().is_some_and(|f| me.folder().cwd == f.cwd))
});
reg.add_method("in_current", |_, me, ()| Ok(me.folder().cwd == me.tab().current.cwd));
reg.add_method("in_preview", |_, me, ()| {
Ok(me.tab().current.hovered().is_some_and(|f| me.folder().cwd == f.url))
});
reg.add_method("found", |lua, me, ()| {
let cx = lua.named_registry_value::<CtxRef>("cx")?;
let Some(finder) = &cx.manager.active().finder else {
Expand Down
4 changes: 1 addition & 3 deletions yazi-plugin/preset/components/current.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ function Current:render(area)

local items, markers = {}, {}
for i, f in ipairs(files) do
local style = f:style()
items[#items + 1] = ui.ListItem(ui.Line(File:full(f)))
:style(f:is_hovered() and style:patch(THEME.manager.hovered) or style)
items[#items + 1] = ui.ListItem(ui.Line(File:full(f))):style(File:style(f))

-- Yanked/marked/selected files
local marker = File:marker(f)
Expand Down
11 changes: 11 additions & 0 deletions yazi-plugin/preset/components/file.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,17 @@ function File:full(file)
}
end

function File:style(file)
local style = file:style()
if not file:is_hovered() then
return style
elseif file:in_preview() then
return style and style:patch(THEME.manager.preview_hovered) or THEME.manager.preview_hovered
else
return style and style:patch(THEME.manager.hovered) or THEME.manager.hovered
end
end

function File:marker(file)
local yanked = file:is_yanked()
if yanked ~= 0 then
Expand Down
4 changes: 1 addition & 3 deletions yazi-plugin/preset/components/parent.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ function Parent:render(area)

local items, markers = {}, {}
for i, f in ipairs(folder.window) do
local style = f:style()
items[#items + 1] = ui.ListItem(ui.Line(File:full(f)))
:style(f:is_hovered() and style:patch(THEME.manager.hovered) or style)
items[#items + 1] = ui.ListItem(ui.Line(File:full(f))):style(File:style(f))

-- Yanked/marked/selected files
local marker = File:marker(f)
Expand Down
4 changes: 1 addition & 3 deletions yazi-plugin/preset/plugins/folder.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ function M:peek()

local items, markers = {}, {}
for i, f in ipairs(folder.window) do
local style = f:style()
items[#items + 1] = ui.ListItem(ui.Line(File:full(f)))
:style(f:is_hovered() and style:patch(THEME.manager.preview_hovered) or style)
items[#items + 1] = ui.ListItem(ui.Line(File:full(f))):style(File:style(f))

-- Yanked/marked/selected files
local marker = File:marker(f)
Expand Down