feat(stages): slide windows after previous closes

See #105

Author: rcarriga

lua/notify/stages/fade_in_slide_out.lua

@@ -3,11 +3,8 @@ local stages_util = require("notify.stages.util")
 return {
   function(state)
     local next_height = state.message.height + 2
-    local next_row = stages_util.available_slot(
-      state.open_windows,
-      next_height,
-      stages_util.DIRECTION.TOP_DOWN
-    )
+    local next_row =
+      stages_util.available_slot(state.open_windows, next_height, stages_util.DIRECTION.TOP_DOWN)
     if not next_row then
       return nil
     end
@@ -23,19 +20,33 @@ return {
       opacity = 0,
     }
   end,
-  function()
+  function(state, win)
     return {
       opacity = { 100 },
       col = { vim.opt.columns:get() },
+      row = {
+        stages_util.slot_after_previous(win, state.open_windows, stages_util.DIRECTION.TOP_DOWN),
+        frequency = 3,
+        complete = function()
+          return true
+        end,
+      },
     }
   end,
-  function()
+  function(state, win)
     return {
       col = { vim.opt.columns:get() },
       time = true,
+      row = {
+        stages_util.slot_after_previous(win, state.open_windows, stages_util.DIRECTION.TOP_DOWN),
+        frequency = 3,
+        complete = function()
+          return true
+        end,
+      },
     }
   end,
-  function()
+  function(state, win)
     return {
       width = {
         1,
@@ -53,6 +64,13 @@ return {
         end,
       },
       col = { vim.opt.columns:get() },
+      row = {
+        stages_util.slot_after_previous(win, state.open_windows, stages_util.DIRECTION.TOP_DOWN),
+        frequency = 3,
+        complete = function()
+          return true
+        end,
+      },
     }
   end,
 }

lua/notify/stages/util.lua

@@ -35,23 +35,27 @@ local move_slot = function(direction, slot, delta)
   return slot - delta
 end
 
+local function slot_key(direction)
+  return (direction == M.DIRECTION.LEFT_RIGHT or direction == M.DIRECTION.RIGHT_LEFT) and "col"
+    or "row"
+end
+
+local function space_key(direction)
+  return (direction == M.DIRECTION.LEFT_RIGHT or direction == M.DIRECTION.RIGHT_LEFT) and "width"
+    or "height"
+end
+
 ---@param windows number[]
 ---@param direction integer
 local function window_intervals(windows, direction, cmp)
   local win_intervals = {}
   for _, w in pairs(windows) do
     local exists, existing_conf = util.get_win_config(w)
     if exists then
-      local slot_key = (direction == M.DIRECTION.LEFT_RIGHT or direction == M.DIRECTION.RIGHT_LEFT)
-          and "col"
-        or "row"
-      local space_key = (direction == M.DIRECTION.LEFT_RIGHT or direction == M.DIRECTION.RIGHT_LEFT)
-          and "width"
-        or "height"
       local border_space = existing_conf.border and 2 or 0
       win_intervals[#win_intervals + 1] = {
-        existing_conf[slot_key],
-        existing_conf[slot_key] + existing_conf[space_key] + border_space,
+        existing_conf[slot_key(direction)],
+        existing_conf[slot_key(direction)] + existing_conf[space_key(direction)] + border_space,
       }
     end
   end
@@ -61,7 +65,7 @@ local function window_intervals(windows, direction, cmp)
   return win_intervals
 end
 
-local function get_slot_range(direction)
+function M.get_slot_range(direction)
   local top = vim.opt.tabline:get() == "" and 0 or 1
   local bottom = vim.opt.lines:get() - (vim.opt.laststatus:get() > 0 and 2 or 1)
   local left = 1
@@ -77,6 +81,7 @@ local function get_slot_range(direction)
   end
   error(string.format("Invalid direction: %s", direction))
 end
+
 ---@param existing_wins number[] Windows to avoid overlapping
 ---@param required_space number Window height or width including borders
 ---@param direction integer Direction to stack windows, one of M.DIRECTION
@@ -85,7 +90,7 @@ function M.available_slot(existing_wins, required_space, direction)
   local cmp = (direction == M.DIRECTION.LEFT_RIGHT or direction == M.DIRECTION.TOP_DOWN) and less
     or greater
 
-  local first_slot, last_slot = get_slot_range(direction)
+  local first_slot, last_slot = M.get_slot_range(direction)
 
   local next_slot = first_slot
 
@@ -133,4 +138,51 @@ available_slot(existing_wins, required_space, stages_util.DIRECTION.TOP_DOWN)
   return M.available_slot(wins, required_space, M.DIRECTION.TOP_DOWN)
 end
 
+---Gets the next slow available for the given window while maintaining its position using the given list.
+---@param win number
+---@param open_windows
+---@param direction
+function M.slot_after_previous(win, open_windows, direction)
+  local key = slot_key(direction)
+  local cmp = (direction == M.DIRECTION.LEFT_RIGHT or direction == M.DIRECTION.TOP_DOWN) and less
+    or greater
+  local exists, cur_win_conf = pcall(vim.api.nvim_win_get_config, win)
+  if not exists then
+    return 0
+  end
+
+  local cur_slot = cur_win_conf[key][false]
+  local win_confs = {}
+  for _, w in ipairs(open_windows) do
+    local success, conf = pcall(vim.api.nvim_win_get_config, w)
+    if success then
+      win_confs[w] = conf
+    end
+  end
+
+  local higher_wins = vim.tbl_filter(function(open_win)
+    return win_confs[open_win] and cmp(win_confs[open_win][key][false], cur_slot)
+  end, open_windows)
+
+  if #higher_wins == 0 then
+    local first_slot = M.get_slot_range(direction)
+    if direction == M.DIRECTION.RIGHT_LEFT or direction == M.DIRECTION.BOTTOM_UP then
+      return move_slot(direction, first_slot, cur_win_conf[space_key(direction)] + 2)
+    end
+    return first_slot
+  end
+
+  table.sort(higher_wins, function(a, b)
+    return cmp(win_confs[a][key][false], win_confs[b][key][false])
+  end)
+
+  local last_win = higher_wins[#higher_wins]
+  local res = move_slot(
+    direction,
+    win_confs[last_win][key][false],
+    win_confs[last_win][space_key(direction)] + 2
+  )
+  return res
+end
+
 return M