From 37ca15e169047ad7919f519bc88ef77936210438 Mon Sep 17 00:00:00 2001
From: James Tan <jamestansx@gmail.com>
Date: Wed, 26 Apr 2023 13:34:43 +0800
Subject: [PATCH 1/2] feat: add `NormalFloat` hl for floating windows

---
 doc/nvim-tree-lua.txt    | 1 +
 lua/nvim-tree/colors.lua | 1 +
 lua/nvim-tree/help.lua   | 2 +-
 lua/nvim-tree/view.lua   | 4 +++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/nvim-tree-lua.txt b/doc/nvim-tree-lua.txt
index 2d3cab36730..4f422901463 100644
--- a/doc/nvim-tree-lua.txt
+++ b/doc/nvim-tree-lua.txt
@@ -1981,6 +1981,7 @@ NvimTreeWindowPicker
 There are also links to normal bindings to style the tree itself.
 
 NvimTreeNormal
+NvimTreeNormalFloat
 NvimTreeEndOfBuffer     (NonText)
 NvimTreeCursorLine      (CursorLine)
 NvimTreeCursorLineNr    (CursorLineNr)
diff --git a/lua/nvim-tree/colors.lua b/lua/nvim-tree/colors.lua
index c7b92dd1681..863e5075d72 100644
--- a/lua/nvim-tree/colors.lua
+++ b/lua/nvim-tree/colors.lua
@@ -66,6 +66,7 @@ local function get_links()
     OpenedFolderIcon = "NvimTreeFolderIcon",
     ClosedFolderIcon = "NvimTreeFolderIcon",
     Normal = "Normal",
+    NormalFloat = "NormalFloat",
     NormalNC = "NvimTreeNormal",
     EndOfBuffer = "EndOfBuffer",
     CursorLineNr = "CursorLineNr",
diff --git a/lua/nvim-tree/help.lua b/lua/nvim-tree/help.lua
index e1ac4470d18..0eb2cbbb031 100644
--- a/lua/nvim-tree/help.lua
+++ b/lua/nvim-tree/help.lua
@@ -5,7 +5,7 @@ local PAT_CTRL = "^<C%-"
 local PAT_SPECIAL = "^<.+"
 
 local WIN_HL = table.concat({
-  "Normal:NvimTreeNormal",
+  "Normal:NvimTreeNormalFloat",
   "CursorLine:NvimTreeCursorLine",
 }, ",")
 
diff --git a/lua/nvim-tree/view.lua b/lua/nvim-tree/view.lua
index 306542c68c0..1ce466bf1d9 100644
--- a/lua/nvim-tree/view.lua
+++ b/lua/nvim-tree/view.lua
@@ -32,7 +32,6 @@ M.View = {
     wrap = false,
     winhl = table.concat({
       "EndOfBuffer:NvimTreeEndOfBuffer",
-      "Normal:NvimTreeNormal",
       "CursorLine:NvimTreeCursorLine",
       "CursorLineNr:NvimTreeCursorLineNr",
       "LineNr:NvimTreeLineNr",
@@ -503,6 +502,9 @@ function M.setup(opts)
   M.View.winopts.relativenumber = options.relativenumber
   M.View.winopts.signcolumn = options.signcolumn
   M.View.float = options.float
+  M.View.winopts.winhl = table.concat({
+    "Normal:" .. (M.View.float.enable and "NvimTreeNormalFloat" or "NvimTreeNormal"),
+  }, ",")
   M.on_attach = opts.on_attach
 
   if type(options.width) == "table" then

From 23b82dcc2a7872edc0f64b7cb970694a579fa7e0 Mon Sep 17 00:00:00 2001
From: James Tan <jamestansx@gmail.com>
Date: Sun, 30 Apr 2023 14:44:16 +0800
Subject: [PATCH 2/2] fix: follow default floatwin bg color

---
 lua/nvim-tree/help.lua | 3 ++-
 lua/nvim-tree/view.lua | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-tree/help.lua b/lua/nvim-tree/help.lua
index 0eb2cbbb031..18036996355 100644
--- a/lua/nvim-tree/help.lua
+++ b/lua/nvim-tree/help.lua
@@ -5,7 +5,8 @@ local PAT_CTRL = "^<C%-"
 local PAT_SPECIAL = "^<.+"
 
 local WIN_HL = table.concat({
-  "Normal:NvimTreeNormalFloat",
+  "NormalFloat:NvimTreeNormalFloat",
+  "WinSeparator:NvimTreeWinSeparator",
   "CursorLine:NvimTreeCursorLine",
 }, ",")
 
diff --git a/lua/nvim-tree/view.lua b/lua/nvim-tree/view.lua
index 1ce466bf1d9..2d6c6a6e032 100644
--- a/lua/nvim-tree/view.lua
+++ b/lua/nvim-tree/view.lua
@@ -39,7 +39,9 @@ M.View = {
       "StatusLine:NvimTreeStatusLine",
       "StatusLineNC:NvimTreeStatuslineNC",
       "SignColumn:NvimTreeSignColumn",
+      "Normal:NvimTreeNormal",
       "NormalNC:NvimTreeNormalNC",
+      "NormalFloat:NvimTreeNormalFloat",
     }, ","),
   },
 }
@@ -502,9 +504,6 @@ function M.setup(opts)
   M.View.winopts.relativenumber = options.relativenumber
   M.View.winopts.signcolumn = options.signcolumn
   M.View.float = options.float
-  M.View.winopts.winhl = table.concat({
-    "Normal:" .. (M.View.float.enable and "NvimTreeNormalFloat" or "NvimTreeNormal"),
-  }, ",")
   M.on_attach = opts.on_attach
 
   if type(options.width) == "table" then