LESA/custum-hyprpanel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gracefully handle the scenario where workspace rules for a monitor are undefined. (#108)

Browse Source 
* Gracefully handle the scenario where workspace rules for a monitor are undefined.

* Added type definitions to function outputs.
This commit is contained in:
Jas Singh
2024-08-10 22:43:41 -07:00
committed by GitHub
parent a3178678dd
commit 0d7bd7dbc2
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/bar/workspaces/index.ts
View File

@@ -9,7 +9,7 @@ function range(length: number, start = 1) {
} }
const Workspaces = (monitor = -1, ws = 8) => { const Workspaces = (monitor = -1, ws = 8) => {
const getWorkspacesForMonitor = (curWs: number, wsRules: WorkspaceMap) => { const getWorkspacesForMonitor = (curWs: number, wsRules: WorkspaceMap): boolean => {
if (!wsRules || !Object.keys(wsRules).length) { if (!wsRules || !Object.keys(wsRules).length) {
return true; return true;
} }
@@ -18,7 +18,12 @@ const Workspaces = (monitor = -1, ws = 8) => {
hyprland.monitors.forEach((m) => (monitorMap[m.id] = m.name)); hyprland.monitors.forEach((m) => (monitorMap[m.id] = m.name));
const currentMonitorName = monitorMap[monitor]; const currentMonitorName = monitorMap[monitor];
return wsRules[currentMonitorName].includes(curWs); const monitorWSRules = wsRules[currentMonitorName];
if (monitorWSRules === undefined) {
return true;
}
return monitorWSRules.includes(curWs);
}; };
const getWorkspaceRules = (): WorkspaceMap => { const getWorkspaceRules = (): WorkspaceMap => {
@@ -42,7 +47,7 @@ const Workspaces = (monitor = -1, ws = 8) => {
} }
}; };
const getCurrentMonitorWorkspaces = () => { const getCurrentMonitorWorkspaces = (): number[] => {
if (hyprland.monitors.length === 1) { if (hyprland.monitors.length === 1) {
return Array.from({ length: workspaces.value }, (_, i) => i + 1); return Array.from({ length: workspaces.value }, (_, i) => i + 1);
} }
@@ -61,7 +66,7 @@ const Workspaces = (monitor = -1, ws = 8) => {
currentMonitorWorkspaces.value = getCurrentMonitorWorkspaces() currentMonitorWorkspaces.value = getCurrentMonitorWorkspaces()
}) })
const goToNextWS = () => { const goToNextWS = (): void => {
const curWorkspace = hyprland.active.workspace.id; const curWorkspace = hyprland.active.workspace.id;
const indexOfWs = currentMonitorWorkspaces.value.indexOf(curWorkspace); const indexOfWs = currentMonitorWorkspaces.value.indexOf(curWorkspace);
let nextIndex = indexOfWs + 1; let nextIndex = indexOfWs + 1;
@@ -72,7 +77,7 @@ const Workspaces = (monitor = -1, ws = 8) => {
hyprland.messageAsync(`dispatch workspace ${currentMonitorWorkspaces.value[nextIndex]}`) hyprland.messageAsync(`dispatch workspace ${currentMonitorWorkspaces.value[nextIndex]}`)
} }
const goToPrevWS = () => { const goToPrevWS = (): void => {
const curWorkspace = hyprland.active.workspace.id; const curWorkspace = hyprland.active.workspace.id;
const indexOfWs = currentMonitorWorkspaces.value.indexOf(curWorkspace); const indexOfWs = currentMonitorWorkspaces.value.indexOf(curWorkspace);
let prevIndex = indexOfWs - 1; let prevIndex = indexOfWs - 1;
@@ -96,7 +101,12 @@ const Workspaces = (monitor = -1, ws = 8) => {
} as T; } as T;
} }
const createThrottledScrollHandlers = (scrollSpeed: number) => { type ThrottledScrollHandlers = {
throttledScrollUp: () => void;
throttledScrollDown: () => void;
};
const createThrottledScrollHandlers = (scrollSpeed: number): ThrottledScrollHandlers => {
const throttledScrollUp = throttle(() => { const throttledScrollUp = throttle(() => {
if (reverse_scroll.value === true) { if (reverse_scroll.value === true) {
goToPrevWS(); goToPrevWS();