Update the ignored workspaces rule to a regex instead of array.

Jas-SinghFSU · Sep 25, 2024 · 69c4682 · 69c4682
1 parent 91bd49e
commit 69c4682
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 27 deletions.
diff --git a/lib/types/options.d.ts b/lib/types/options.d.ts
@@ -215,6 +215,3 @@ export type ColorMapKey = keyof typeof defaultColorMap;
 export type ColorMapValue = (typeof defaultColorMap)[ColorMapKey];
 
 export type ScalingPriority = 'gdk' | 'hyprland' | 'both';
-
-export type IgnoredWorkspace = number | string;
-export type IgnoredWorkspaces = IgnoredWorkspace[];
diff --git a/modules/bar/workspaces/helpers.ts b/modules/bar/workspaces/helpers.ts
@@ -1,6 +1,5 @@
 const hyprland = await Service.import('hyprland');
 
-import { IgnoredWorkspace, IgnoredWorkspaces } from 'lib/types/options';
 import { MonitorMap, WorkspaceMap, WorkspaceRule } from 'lib/types/workspace';
 import options from 'options';
 import { Variable } from 'types/variable';
@@ -72,28 +71,19 @@ type ThrottledScrollHandlers = {
     throttledScrollDown: () => void;
 };
 
-export const isWorkspaceIgnored = (
-    ignoredWorkspaces: Variable<IgnoredWorkspaces>,
-    workspaceNumber: number,
-): boolean => {
-    const ignoredValues = ignoredWorkspaces.value;
+export const isWorkspaceIgnored = (ignoredWorkspaces: Variable<string>, workspaceNumber: number): boolean => {
+    if (ignoredWorkspaces.value === '') return false;
 
-    return ignoredValues.some((ignore: IgnoredWorkspace) => {
-        if (typeof ignore === 'number') {
-            return ignore === workspaceNumber;
-        }
-        if (typeof ignore === 'string') {
-            return new RegExp(ignore).test(workspaceNumber.toString());
-        }
-        return true;
-    });
+    const ignoredWsRegex = new RegExp(ignoredWorkspaces.value);
+
+    return ignoredWsRegex.test(workspaceNumber.toString());
 };
 
 const navigateWorkspace = (
     direction: 'next' | 'prev',
     currentMonitorWorkspaces: Variable<number[]>,
     activeWorkspaces: boolean,
-    ignoredWorkspaces: Variable<IgnoredWorkspaces>,
+    ignoredWorkspaces: Variable<string>,
 ): void => {
     const workspacesList = activeWorkspaces
         ? hyprland.workspaces.filter((ws) => hyprland.active.monitor.id === ws.monitorID).map((ws) => ws.id)
@@ -120,15 +110,15 @@ const navigateWorkspace = (
 export const goToNextWS = (
     currentMonitorWorkspaces: Variable<number[]>,
     activeWorkspaces: boolean,
-    ignoredWorkspaces: Variable<IgnoredWorkspaces>,
+    ignoredWorkspaces: Variable<string>,
 ): void => {
     navigateWorkspace('next', currentMonitorWorkspaces, activeWorkspaces, ignoredWorkspaces);
 };
 
 export const goToPrevWS = (
     currentMonitorWorkspaces: Variable<number[]>,
     activeWorkspaces: boolean,
-    ignoredWorkspaces: Variable<IgnoredWorkspaces>,
+    ignoredWorkspaces: Variable<string>,
 ): void => {
     navigateWorkspace('prev', currentMonitorWorkspaces, activeWorkspaces, ignoredWorkspaces);
 };

diff --git a/options.ts b/options.ts
@@ -13,7 +13,6 @@ import {
     ActiveWsIndicator,
     BarButtonStyles,
     BarLocation,
-    IgnoredWorkspaces,
     NotificationAnchor,
     OSDAnchor,
     OSDOrientation,
@@ -862,7 +861,7 @@ const options = mkOptions(OPTIONS, {
         },
         workspaces: {
             show_icons: opt(false),
-            ignored: opt<IgnoredWorkspaces>([]),
+            ignored: opt(''),
             show_numbered: opt(false),
             showWsIcons: opt(false),
             numbered_active_indicator: opt<ActiveWsIndicator>('underline'),

diff --git a/widget/settings/pages/config/bar/index.ts b/widget/settings/pages/config/bar/index.ts
@@ -300,10 +300,8 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
                 Option({
                     opt: options.bar.workspaces.ignored,
                     title: 'Ignored Workspaces',
-                    subtitle:
-                        'An array of workspace numbers to ignore.\n' +
-                        'A regular expression can be passed in the array to ignore workspaces that match the regex.',
-                    type: 'object',
+                    subtitle: 'A regex that defines workspaces to ignore',
+                    type: 'string',
                 }),
 
                 /*