diff --git a/customModules/submap/helpers.ts b/customModules/submap/helpers.ts new file mode 100644 index 0000000..0c38718 --- /dev/null +++ b/customModules/submap/helpers.ts @@ -0,0 +1,20 @@ +import { Variable } from 'types/variable'; + +const hyprland = await Service.import('hyprland'); + +export const isSubmapEnabled = (submap: string, enabled: string, disabled: string): string => { + return submap !== 'default' ? enabled : disabled; +}; + +export const getInitialSubmap = (submapStatus: Variable): void => { + let submap = hyprland.message('submap'); + + const newLineCarriage = /\n/g; + submap = submap.replace(newLineCarriage, ''); + + if (submap === 'unknown request') { + submap = 'default'; + } + + submapStatus.value = submap; +}; diff --git a/customModules/submap/index.ts b/customModules/submap/index.ts index c97fa2c..c83316e 100644 --- a/customModules/submap/index.ts +++ b/customModules/submap/index.ts @@ -7,7 +7,8 @@ import Button from 'types/widgets/button'; import { Variable as VariableType } from 'types/variable'; import { Attribute, Child } from 'lib/types/widget'; import { BarBoxChild } from 'lib/types/bar'; -import { caapitalizeFirstLetter } from 'lib/utils'; +import { capitalizeFirstLetter } from 'lib/utils'; +import { getInitialSubmap, isSubmapEnabled } from './helpers'; const { label, @@ -23,18 +24,24 @@ const { scrollDown, } = options.bar.customModules.submap; -const submapStatus: VariableType = Variable(''); +const submapStatus: VariableType = Variable('default'); hyprland.connect('submap', (_, currentSubmap) => { - submapStatus.value = currentSubmap; + if (currentSubmap.length === 0) { + submapStatus.value = 'default'; + } else { + submapStatus.value = currentSubmap; + } }); +getInitialSubmap(submapStatus); + export const Submap = (): BarBoxChild => { const submapModule = module({ textIcon: Utils.merge( [submapStatus.bind('value'), enabledIcon.bind('value'), disabledIcon.bind('value')], (status, enabled, disabled) => { - return status.length > 0 ? enabled : disabled; + return isSubmapEnabled(status, enabled, disabled); }, ), tooltipText: Utils.merge( @@ -46,9 +53,9 @@ export const Submap = (): BarBoxChild => { ], (status, enabled, disabled, showSmName) => { if (showSmName) { - return status.length > 0 ? caapitalizeFirstLetter(status) : 'Default'; + return capitalizeFirstLetter(status); } - return status.length > 0 ? enabled : disabled; + return isSubmapEnabled(status, enabled, disabled); }, ), boxClass: 'submap', @@ -61,9 +68,9 @@ export const Submap = (): BarBoxChild => { ], (status, enabled, disabled, showSmName) => { if (showSmName) { - return status.length > 0 ? caapitalizeFirstLetter(status) : 'Default'; + return capitalizeFirstLetter(status); } - return status.length > 0 ? enabled : disabled; + return isSubmapEnabled(status, enabled, disabled); }, ), showLabelBinding: label.bind('value'), diff --git a/lib/utils.ts b/lib/utils.ts index dd5b316..8b8fd04 100644 --- a/lib/utils.ts +++ b/lib/utils.ts @@ -190,6 +190,6 @@ export const isValidGjsColor = (color: string): boolean => { return false; }; -export const caapitalizeFirstLetter = (str: string): string => { +export const capitalizeFirstLetter = (str: string): string => { return str.charAt(0).toUpperCase() + str.slice(1); };