Minor: Refactor the code-base for better organization and compartmentalization. (#934)
* Clean up unused code * Fix media player formatting issue for labels with new line characteres. * Refactor the media player handlers into a class. * More code cleanup and organize shared weather utils into distinct classes. * Flatten some nesting. * Move weather manager in dedicated class and build HTTP Utility class for Rest API calling. * Remove logs * Rebase master merge * Reorg code (WIP) * More reorg * Delete utility scripts * Reorg options * Finish moving all options over * Fix typescript issues * Update options imports to default * missed update * Screw barrel files honestly, work of the devil. * Only initialize power profiles if power-profiles-daemon is running. * Fix window positioning and weather service naming * style dir * More organization * Restructure types to be closer to their source * Remove lib types and constants * Update basic weather object to be saner with extensibility. * Service updates * Fix initialization strategy for services. * Fix Config Manager to only emit changed objects and added missing temp converters. * Update storage service to handle unit changes. * Added cpu temp sensor auto-discovery * Added missing JSDocs to services * remove unused * Migrate to network service. * Fix network password issue. * Move out password input into helper * Rename password mask constant to be less double-negativey. * Dropdown menu rename * Added a component to edit JSON in the settings dialog (rough/WIP) * Align settings * Add and style JSON Editor. * Adjust padding * perf(shortcuts): ⚡ avoid unnecessary polling when shortcuts are disabled Stops the recording poller when shortcuts are disabled, preventing redundant polling and reducing resource usage. * Fix types and return value if shortcut not enabled. * Move the swww daemon checking process outside of the wallpaper service into a dedicated deamon lifecyle processor. * Add more string formatters and use title case for weather status (as it was). * Fix startup errors. * Rgba fix * Remove zod from dependencies --------- Co-authored-by: KernelDiego <gonzalezdiego.contact@gmail.com>
This commit is contained in:
98
src/components/bar/shared/module/index.tsx
Normal file
98
src/components/bar/shared/module/index.tsx
Normal file
@@ -0,0 +1,98 @@
|
||||
import { bind, Variable } from 'astal';
|
||||
import { BarBoxChild, BarModuleProps } from 'src/components/bar/types';
|
||||
import { BarButtonStyles } from 'src/lib/options/types';
|
||||
import options from 'src/configuration';
|
||||
|
||||
const { style } = options.theme.bar.buttons;
|
||||
|
||||
export const Module = ({
|
||||
icon,
|
||||
textIcon,
|
||||
useTextIcon = bind(Variable(false)),
|
||||
label,
|
||||
truncationSize = bind(Variable(-1)),
|
||||
tooltipText = '',
|
||||
boxClass,
|
||||
isVis,
|
||||
props = {},
|
||||
showLabelBinding = bind(Variable(true)),
|
||||
showIconBinding = bind(Variable(true)),
|
||||
showLabel = true,
|
||||
labelHook,
|
||||
hook,
|
||||
}: BarModuleProps): BarBoxChild => {
|
||||
const getIconWidget = (useTxtIcn: boolean): JSX.Element | undefined => {
|
||||
const className = `txt-icon bar-button-icon module-icon ${boxClass}`;
|
||||
|
||||
const icn = typeof icon === 'string' ? icon : icon?.get();
|
||||
if (!useTxtIcn && icn !== undefined && icn.length > 0) {
|
||||
return <icon className={className} icon={icon} />;
|
||||
}
|
||||
|
||||
const textIcn = typeof textIcon === 'string' ? textIcon : textIcon?.get();
|
||||
if (textIcn !== undefined && textIcn.length > 0) {
|
||||
return <label className={className} label={textIcon} />;
|
||||
}
|
||||
};
|
||||
|
||||
const componentClass = Variable.derive(
|
||||
[bind(style), showLabelBinding],
|
||||
(style: BarButtonStyles, shwLabel: boolean) => {
|
||||
const shouldShowLabel = shwLabel || showLabel;
|
||||
const styleMap = {
|
||||
default: 'style1',
|
||||
split: 'style2',
|
||||
wave: 'style3',
|
||||
wave2: 'style3',
|
||||
};
|
||||
return `${boxClass} ${styleMap[style]} ${!shouldShowLabel ? 'no-label' : ''}`;
|
||||
},
|
||||
);
|
||||
|
||||
const componentChildren = Variable.derive(
|
||||
[showLabelBinding, showIconBinding, useTextIcon],
|
||||
(showLabel: boolean, showIcon: boolean, forceTextIcon: boolean): JSX.Element[] => {
|
||||
const childrenArray = [];
|
||||
const iconWidget = getIconWidget(forceTextIcon);
|
||||
|
||||
if (showIcon && iconWidget !== undefined) {
|
||||
childrenArray.push(iconWidget);
|
||||
}
|
||||
|
||||
if (showLabel) {
|
||||
childrenArray.push(
|
||||
<label
|
||||
className={`bar-button-label module-label ${boxClass}`}
|
||||
truncate={truncationSize.as((truncSize) => truncSize > 0)}
|
||||
maxWidthChars={truncationSize.as((truncSize) => truncSize)}
|
||||
label={label ?? ''}
|
||||
setup={labelHook}
|
||||
/>,
|
||||
);
|
||||
}
|
||||
return childrenArray;
|
||||
},
|
||||
);
|
||||
|
||||
const component: JSX.Element = (
|
||||
<box
|
||||
tooltipText={tooltipText}
|
||||
className={componentClass()}
|
||||
setup={hook}
|
||||
onDestroy={() => {
|
||||
componentChildren.drop();
|
||||
componentClass.drop();
|
||||
}}
|
||||
>
|
||||
{componentChildren()}
|
||||
</box>
|
||||
);
|
||||
|
||||
return {
|
||||
component,
|
||||
tooltip_text: tooltipText,
|
||||
isVis: isVis,
|
||||
boxClass,
|
||||
props,
|
||||
};
|
||||
};
|
||||
Reference in New Issue
Block a user