fix(ags nvim): get eslint to work again and update deps
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
a79cb29aaf
commit
28615e8152
31 changed files with 773 additions and 734 deletions
|
@ -66,6 +66,41 @@ in
|
|||
command = 'EslintFixAll',
|
||||
});
|
||||
end,
|
||||
|
||||
settings = {
|
||||
validate = 'on',
|
||||
packageManager = 'npm',
|
||||
useESLintClass = true,
|
||||
useFlatConfig = true,
|
||||
experimental = {
|
||||
useFlatConfig = true,
|
||||
},
|
||||
codeAction = {
|
||||
disableRuleComment = {
|
||||
enable = true,
|
||||
location = 'separateLine'
|
||||
},
|
||||
showDocumentation = {
|
||||
enable = true,
|
||||
},
|
||||
},
|
||||
codeActionOnSave = {
|
||||
mode = 'all',
|
||||
rules = {},
|
||||
},
|
||||
format = true,
|
||||
quiet = false,
|
||||
onIgnoredFiles = 'off',
|
||||
rulesCustomizations = {},
|
||||
run = 'onType',
|
||||
problems = {
|
||||
shortenToSingleLine = false,
|
||||
},
|
||||
nodePath = "",
|
||||
workingDirectory = {
|
||||
mode = 'location',
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
lsp.cssls.setup({
|
||||
|
|
|
@ -1,29 +1,23 @@
|
|||
// TODO: switch to typescript https://github.com/eslint/eslint/pull/18134
|
||||
|
||||
import eslint from '@eslint/js';
|
||||
|
||||
import tseslint from 'typescript-eslint';
|
||||
import tsPlugin from '@typescript-eslint/eslint-plugin';
|
||||
|
||||
import stylistic from '@stylistic/eslint-plugin';
|
||||
// import stylisticRules from '@stylistic/eslint-plugin/rule-options';
|
||||
|
||||
import jsdoc from 'eslint-plugin-jsdoc';
|
||||
import stylistic from '@stylistic/eslint-plugin';
|
||||
import tseslint from 'typescript-eslint';
|
||||
|
||||
|
||||
export default tseslint.config(
|
||||
// @ts-expect-error this works
|
||||
export default tseslint.config({
|
||||
// @ts-expect-error this should work
|
||||
files: ['**/*.js', '**/*.ts'],
|
||||
ignores: ['node_modules/**', 'types/**'],
|
||||
|
||||
extends: [
|
||||
eslint.configs.recommended,
|
||||
jsdoc.configs['flat/recommended-typescript'],
|
||||
|
||||
{ ignores: ['js'] },
|
||||
|
||||
{
|
||||
plugins: {
|
||||
jsdoc,
|
||||
'@stylistic': stylistic, // as typeof stylisticRules,
|
||||
'@typescript-eslint': tsPlugin,
|
||||
},
|
||||
stylistic.configs['recommended-flat'],
|
||||
...tseslint.configs.recommended,
|
||||
...tseslint.configs.stylistic,
|
||||
],
|
||||
|
||||
rules: {
|
||||
// JSDoc settings
|
||||
|
@ -31,10 +25,13 @@ export default tseslint.config(
|
|||
'jsdoc/check-line-alignment': ['warn', 'always', {
|
||||
tags: ['param', 'arg', 'argument', 'property', 'prop'],
|
||||
}],
|
||||
'jsdoc/no-types': 'off',
|
||||
|
||||
// Newer settings
|
||||
'@typescript-eslint/no-extraneous-class': ['off'],
|
||||
'@typescript-eslint/no-implied-eval': ['off'],
|
||||
'class-methods-use-this': 'off',
|
||||
'@stylistic/no-multiple-empty-lines': 'off',
|
||||
|
||||
// Pre-flat config
|
||||
'@typescript-eslint/no-unused-vars': [
|
||||
|
@ -78,9 +75,6 @@ export default tseslint.config(
|
|||
'block-scoped-var': [
|
||||
'error',
|
||||
],
|
||||
'class-methods-use-this': [
|
||||
'error',
|
||||
],
|
||||
'curly': [
|
||||
'warn',
|
||||
],
|
||||
|
@ -457,5 +451,4 @@ export default tseslint.config(
|
|||
'warn',
|
||||
],
|
||||
},
|
||||
},
|
||||
);
|
||||
});
|
||||
|
|
264
modules/ags/config/global-types.d.ts
vendored
264
modules/ags/config/global-types.d.ts
vendored
|
@ -5,137 +5,6 @@ import { Variable as Var } from 'types/variable';
|
|||
import { Widget as agsWidget } from 'types/widgets/widget';
|
||||
export type AgsWidget = agsWidget<unknown> & Widget;
|
||||
|
||||
// For ./ts/applauncher/main.ts
|
||||
import { Application } from 'types/service/applications.ts';
|
||||
import { CursorBoxProps } from 'ts/misc/cursorbox';
|
||||
export type AgsAppItem = AgsEventBox<Widget, { app: Application }
|
||||
& CursorBoxProps<Widget, unknown>>;
|
||||
|
||||
// For ./ts/bar/hovers/keyboard.ts
|
||||
export type Keyboard = {
|
||||
address: string;
|
||||
name: string;
|
||||
rules: string;
|
||||
model: string;
|
||||
layout: string;
|
||||
variant: string;
|
||||
options: string;
|
||||
active_keymap: string;
|
||||
main: boolean;
|
||||
};
|
||||
|
||||
// For ./ts/bar/items/workspaces.ts
|
||||
// TODO: improve type
|
||||
export type Workspace = AgsRevealer<unknown & Widget, unknown & { id: number }>;
|
||||
|
||||
// For ./ts/bar/fullscreen.ts
|
||||
export type DefaultProps = RevealerProps<CenterBoxGeneric>;
|
||||
|
||||
// For ./ts/media-player/gesture.ts
|
||||
export type Gesture = {
|
||||
attribute?: object
|
||||
setup?(self: OverlayGeneric): void
|
||||
props?: OverlayProps<unknown & Widget, unknown>
|
||||
};
|
||||
|
||||
// For ./ts/media-player/mpris.ts
|
||||
type PlayerDragProps = unknown & { dragging: boolean };
|
||||
export type PlayerDrag = AgsCenterBox<
|
||||
unknown & Widget, unknown & Widget, unknown & Widget, unknown & PlayerDragProps
|
||||
>;
|
||||
type Colors = {
|
||||
imageAccent: string;
|
||||
buttonAccent: string;
|
||||
buttonText: string;
|
||||
hoverAccent: string;
|
||||
};
|
||||
|
||||
// For ./ts/media-player
|
||||
export type PlayerBoxProps = {
|
||||
bgStyle: string,
|
||||
player: MprisPlayer,
|
||||
};
|
||||
export type PlayerBox = AgsCenterBox<
|
||||
unknown & Widget, unknown & Widget, unknown & Widget, PlayerBoxProps
|
||||
>;
|
||||
export type PlayerOverlay = AgsOverlay<AgsWidget, {
|
||||
players: Map;
|
||||
setup: boolean;
|
||||
dragging: boolean;
|
||||
includesWidget(playerW: PlayerBox): PlayerBox;
|
||||
showTopOnly(): void;
|
||||
moveToTop(player: PlayerBox): void;
|
||||
}>;
|
||||
export type PlayerButtonType = {
|
||||
player: MprisPlayer
|
||||
colors: Var<Colors>
|
||||
children: StackProps['children']
|
||||
onClick: string
|
||||
prop: string
|
||||
};
|
||||
|
||||
// For ./ts/notifications/gesture.js
|
||||
type NotifGestureProps = {
|
||||
dragging: boolean;
|
||||
hovered: boolean
|
||||
ready: boolean
|
||||
id: number;
|
||||
slideAway(side: 'Left' | 'Right'): void;
|
||||
};
|
||||
export type NotifGesture = AgsEventBox<BoxGeneric, NotifGestureProps>;
|
||||
|
||||
// For ./ts/osd/ctor.ts
|
||||
export type OSDStack = AgsStack<unknown & Widget, {
|
||||
popup(osd: string): void,
|
||||
}>;
|
||||
export type ConnectFunc = (self?: ProgressBarGeneric) => void;
|
||||
export type OSD = {
|
||||
name: string;
|
||||
icon: IconPropsGeneric['icon'];
|
||||
info: {
|
||||
mod: GObject.Object;
|
||||
signal?: string | string[];
|
||||
logic?(self: ProgressBarGeneric): void;
|
||||
widget?: AgsWidget;
|
||||
}
|
||||
};
|
||||
|
||||
// For ./ts/on-screen-keyboard
|
||||
export type OskWindow = Window<BoxGeneric, {
|
||||
startY: null | number;
|
||||
setVisible: (state: boolean) => void;
|
||||
killGestureSigs: () => void;
|
||||
setSlideUp: () => void;
|
||||
setSlideDown: () => void;
|
||||
}>;
|
||||
|
||||
// For CursorBox
|
||||
import { CursorBox, CursorBoxProps } from 'ts/misc/cursorbox';
|
||||
export type CursorBox = CursorBox;
|
||||
export type CursorBoxProps = CursorBoxProps;
|
||||
|
||||
// For PopupWindow
|
||||
export type HyprTransition = 'slide' | 'slide top' | 'slide bottom' | 'slide left' |
|
||||
'slide right' | 'popin' | 'fade';
|
||||
export type CloseType = 'none' | 'stay' | 'released' | 'clicked';
|
||||
import { PopupWindow } from 'ts/misc/popup';
|
||||
export type PopupWindow = PopupWindow;
|
||||
|
||||
// For ./ts/quick-settings
|
||||
import { BluetoothDevice as BTDev } from 'types/service/bluetooth.ts';
|
||||
export type APType = {
|
||||
bssid: string
|
||||
address: string
|
||||
lastSeen: number
|
||||
ssid: string
|
||||
active: boolean
|
||||
strength: number
|
||||
iconName: string
|
||||
};
|
||||
export type APBox = AgsBox<unknown & Widget, { ap: Var<APType> }>;
|
||||
export type DeviceBox = AgsBox<unknown & Widget, { dev: BTDev }>;
|
||||
|
||||
|
||||
// Generic widgets
|
||||
import AgsBox from 'types/widgets/box.ts';
|
||||
export type BoxGeneric = AgsBox<unknown & Widget, unknown>;
|
||||
|
@ -168,10 +37,141 @@ import AgsRevealer, { RevealerProps } from 'types/widgets/revealer';
|
|||
export type RevealerGeneric = AgsRevealer<unknown & Widget, unknown>;
|
||||
|
||||
import AgsStack, { StackProps } from 'types/widgets/stack';
|
||||
export type StackGeneric = AgsStack<{ [name: string]: Widget; }, unknown>;
|
||||
export type StackGeneric = AgsStack<Record<string, Widget>, unknown>;
|
||||
|
||||
import AgsScrollable from 'types/widgets/scrollable';
|
||||
export type ScrollableGeneric = AgsScrollable<unkown & Widget, unknown>;
|
||||
|
||||
import AgsWindow from 'types/widgets/window';
|
||||
export type WindowGeneric = AgsWindow<unknown & Widget, unknown>;
|
||||
|
||||
|
||||
// For ./ts/applauncher/main.ts
|
||||
import { Application } from 'types/service/applications.ts';
|
||||
import { CursorBoxProps } from 'ts/misc/cursorbox';
|
||||
export type AgsAppItem = AgsEventBox<Widget, { app: Application }
|
||||
& CursorBoxProps<Widget, unknown>>;
|
||||
|
||||
// For ./ts/bar/hovers/keyboard.ts
|
||||
export interface Keyboard {
|
||||
address: string
|
||||
name: string
|
||||
rules: string
|
||||
model: string
|
||||
layout: string
|
||||
variant: string
|
||||
options: string
|
||||
active_keymap: string
|
||||
main: boolean
|
||||
}
|
||||
|
||||
// For ./ts/bar/items/workspaces.ts
|
||||
// TODO: improve type
|
||||
export type Workspace = AgsRevealer<unknown & Widget, unknown & { id: number }>;
|
||||
|
||||
// For ./ts/bar/fullscreen.ts
|
||||
export type DefaultProps = RevealerProps<CenterBoxGeneric>;
|
||||
|
||||
// For ./ts/media-player/gesture.ts
|
||||
export interface Gesture {
|
||||
attribute?: object
|
||||
setup?(self: OverlayGeneric): void
|
||||
props?: OverlayProps<unknown & Widget, unknown>
|
||||
}
|
||||
|
||||
// For ./ts/media-player/mpris.ts
|
||||
type PlayerDragProps = unknown & { dragging: boolean };
|
||||
export type PlayerDrag = AgsCenterBox<
|
||||
unknown & Widget, unknown & Widget, unknown & Widget, unknown & PlayerDragProps
|
||||
>;
|
||||
interface Colors {
|
||||
imageAccent: string
|
||||
buttonAccent: string
|
||||
buttonText: string
|
||||
hoverAccent: string
|
||||
}
|
||||
|
||||
// For ./ts/media-player
|
||||
export interface PlayerBoxProps {
|
||||
bgStyle: string
|
||||
player: MprisPlayer
|
||||
}
|
||||
export type PlayerBox = AgsCenterBox<
|
||||
unknown & Widget, unknown & Widget, unknown & Widget, PlayerBoxProps
|
||||
>;
|
||||
export type PlayerOverlay = AgsOverlay<AgsWidget, {
|
||||
players: Map
|
||||
setup: boolean
|
||||
dragging: boolean
|
||||
includesWidget(playerW: PlayerBox): PlayerBox
|
||||
showTopOnly(): void
|
||||
moveToTop(player: PlayerBox): void
|
||||
}>;
|
||||
export interface PlayerButtonType {
|
||||
player: MprisPlayer
|
||||
colors: Var<Colors>
|
||||
children: StackProps['children']
|
||||
onClick: string
|
||||
prop: string
|
||||
}
|
||||
|
||||
// For ./ts/notifications/gesture.js
|
||||
interface NotifGestureProps {
|
||||
dragging: boolean
|
||||
hovered: boolean
|
||||
ready: boolean
|
||||
id: number
|
||||
slideAway(side: 'Left' | 'Right'): void
|
||||
}
|
||||
export type NotifGesture = AgsEventBox<BoxGeneric, NotifGestureProps>;
|
||||
|
||||
// For ./ts/osd/ctor.ts
|
||||
export type OSDStack = AgsStack<unknown & Widget, {
|
||||
popup(osd: string): void
|
||||
}>;
|
||||
export type ConnectFunc = (self?: ProgressBarGeneric) => void;
|
||||
export interface OSD {
|
||||
name: string
|
||||
icon: IconPropsGeneric['icon']
|
||||
info: {
|
||||
mod: GObject.Object
|
||||
signal?: string | string[]
|
||||
logic?(self: ProgressBarGeneric): void
|
||||
widget?: AgsWidget
|
||||
}
|
||||
}
|
||||
|
||||
// For ./ts/on-screen-keyboard
|
||||
export type OskWindow = Window<BoxGeneric, {
|
||||
startY: null | number
|
||||
setVisible: (state: boolean) => void
|
||||
killGestureSigs: () => void
|
||||
setSlideUp: () => void
|
||||
setSlideDown: () => void
|
||||
}>;
|
||||
|
||||
// For CursorBox
|
||||
import { CursorBox, CursorBoxProps } from 'ts/misc/cursorbox';
|
||||
export type CursorBox = CursorBox;
|
||||
export type CursorBoxProps = CursorBoxProps;
|
||||
|
||||
// For PopupWindow
|
||||
export type HyprTransition = 'slide' | 'slide top' | 'slide bottom' | 'slide left' |
|
||||
'slide right' | 'popin' | 'fade';
|
||||
export type CloseType = 'none' | 'stay' | 'released' | 'clicked';
|
||||
import { PopupWindow } from 'ts/misc/popup';
|
||||
export type PopupWindow = PopupWindow;
|
||||
|
||||
// For ./ts/quick-settings
|
||||
import { BluetoothDevice as BTDev } from 'types/service/bluetooth.ts';
|
||||
export interface APType {
|
||||
bssid: string
|
||||
address: string
|
||||
lastSeen: number
|
||||
ssid: string
|
||||
active: boolean
|
||||
strength: number
|
||||
iconName: string
|
||||
}
|
||||
export type APBox = AgsBox<unknown & Widget, { ap: Var<APType> }>;
|
||||
export type DeviceBox = AgsBox<unknown & Widget, { dev: BTDev }>;
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
const { execAsync, monitorFile } = Utils;
|
||||
|
||||
|
||||
/** @param {string} host */
|
||||
/**
|
||||
* @param {string} host the name of the machine/user who's running ags
|
||||
*/
|
||||
const watchAndCompileSass = (host) => {
|
||||
const reloadCss = () => {
|
||||
const scss = `${App.configDir}/scss/${host}.scss`;
|
||||
|
@ -20,7 +22,10 @@ const watchAndCompileSass = (host) => {
|
|||
reloadCss();
|
||||
};
|
||||
|
||||
/** @param {string} host */
|
||||
/**
|
||||
* @param {string} host the name of the machine/user who's running ags
|
||||
* @returns the config
|
||||
*/
|
||||
export const transpileTypeScript = async(host) => {
|
||||
const outPath = `/tmp/ags-${host}/index.js`;
|
||||
|
||||
|
|
BIN
modules/ags/config/package-lock.json
generated
BIN
modules/ags/config/package-lock.json
generated
Binary file not shown.
|
@ -5,16 +5,13 @@
|
|||
"fzf": "0.5.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "9.7.0",
|
||||
"@stylistic/eslint-plugin": "2.3.0",
|
||||
"@eslint/js": "9.8.0",
|
||||
"@stylistic/eslint-plugin": "2.6.1",
|
||||
"@types/eslint__js": "8.42.3",
|
||||
"@types/node": "20.14.11",
|
||||
"eslint": "9.7.0",
|
||||
"eslint-plugin-jsdoc": "48.7.0",
|
||||
"typescript": "5.5.3",
|
||||
"typescript-eslint": "7.16.1"
|
||||
},
|
||||
"overrides": {
|
||||
"eslint": "$eslint"
|
||||
"@types/node": "22.0.2",
|
||||
"eslint": "9.8.0",
|
||||
"eslint-plugin-jsdoc": "48.10.2",
|
||||
"typescript": "5.5.4",
|
||||
"typescript-eslint": "8.0.0"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -41,22 +41,6 @@ class Brightness extends Service {
|
|||
return this.#kbd;
|
||||
}
|
||||
|
||||
get screen() {
|
||||
return this.#screen;
|
||||
}
|
||||
|
||||
get screenIcon() {
|
||||
return this.#screenIcon;
|
||||
}
|
||||
|
||||
get caps() {
|
||||
return this.#caps;
|
||||
}
|
||||
|
||||
get capsIcon() {
|
||||
return this.#capsIcon;
|
||||
}
|
||||
|
||||
set kbd(value) {
|
||||
if (value < 0 || value > this.#kbdMax) {
|
||||
return;
|
||||
|
@ -70,6 +54,10 @@ class Brightness extends Service {
|
|||
.catch(console.error);
|
||||
}
|
||||
|
||||
get screen() {
|
||||
return this.#screen;
|
||||
}
|
||||
|
||||
set screen(percent) {
|
||||
if (percent < 0) {
|
||||
percent = 0;
|
||||
|
@ -88,16 +76,27 @@ class Brightness extends Service {
|
|||
.catch(console.error);
|
||||
}
|
||||
|
||||
get screenIcon() {
|
||||
return this.#screenIcon;
|
||||
}
|
||||
|
||||
get caps() {
|
||||
return this.#caps;
|
||||
}
|
||||
|
||||
get capsIcon() {
|
||||
return this.#capsIcon;
|
||||
}
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
try {
|
||||
this.#monitorKbdState();
|
||||
this.#kbdMax = Number(exec(`brightnessctl -d ${KBD} m`));
|
||||
this.#caps = Number(exec(`bash -c brightnessctl -d ${this.#capsName} g`));
|
||||
this.#screen = Number(exec('brightnessctl g')) /
|
||||
Number(exec('brightnessctl m'));
|
||||
this.#screen = Number(exec('brightnessctl g')) / Number(exec('brightnessctl m'));
|
||||
}
|
||||
catch (error) {
|
||||
catch (_e) {
|
||||
console.error('missing dependancy: brightnessctl');
|
||||
}
|
||||
}
|
||||
|
@ -140,6 +139,7 @@ class Brightness extends Service {
|
|||
}
|
||||
},
|
||||
).catch(() => {
|
||||
// @ts-expect-error this works in ags
|
||||
interval.destroy();
|
||||
});
|
||||
}, INTERVAL);
|
||||
|
|
|
@ -16,7 +16,7 @@ class Clipboard extends Service {
|
|||
// Class Attributes
|
||||
private _clips_left = 0;
|
||||
|
||||
private _clips: Map<number, { clip: string; isImage: boolean }> = new Map();
|
||||
private _clips = new Map<number, { clip: string, isImage: boolean }>();
|
||||
|
||||
get clips() {
|
||||
return this._clips;
|
||||
|
@ -83,7 +83,7 @@ class Clipboard extends Service {
|
|||
if (clip.includes('img')) {
|
||||
this._decrementClipsLeft();
|
||||
|
||||
const newClip: [number, {clip: string; isImage: boolean;}] = [
|
||||
const newClip: [number, { clip: string, isImage: boolean }] = [
|
||||
parseInt((clip.match('[0-9]+') ?? [''])[0]),
|
||||
{
|
||||
clip,
|
||||
|
@ -98,7 +98,7 @@ class Clipboard extends Service {
|
|||
const decodedClip = await this._decodeItem(clip);
|
||||
|
||||
if (decodedClip) {
|
||||
const newClip: [number, {clip: string; isImage: boolean;}] = [
|
||||
const newClip: [number, { clip: string, isImage: boolean }] = [
|
||||
parseInt(clip),
|
||||
{
|
||||
clip: decodedClip,
|
||||
|
|
|
@ -14,27 +14,27 @@ const ON_CLICK_TRIGGERS = [
|
|||
// Types
|
||||
import { PopupWindow } from 'global-types';
|
||||
import { Subprocess } from 'types/@girs/gio-2.0/gio-2.0.cjs';
|
||||
type Layer = {
|
||||
address: string;
|
||||
x: number;
|
||||
y: number;
|
||||
w: number;
|
||||
h: number;
|
||||
namespace: string;
|
||||
};
|
||||
type Levels = {
|
||||
0?: Array<Layer> | null;
|
||||
1?: Array<Layer> | null;
|
||||
2?: Array<Layer> | null;
|
||||
3?: Array<Layer> | null;
|
||||
};
|
||||
type Layers = {
|
||||
levels: Levels;
|
||||
};
|
||||
type CursorPos = {
|
||||
x: number;
|
||||
y: number;
|
||||
};
|
||||
interface Layer {
|
||||
address: string
|
||||
x: number
|
||||
y: number
|
||||
w: number
|
||||
h: number
|
||||
namespace: string
|
||||
}
|
||||
interface Levels {
|
||||
0?: Layer[] | null
|
||||
1?: Layer[] | null
|
||||
2?: Layer[] | null
|
||||
3?: Layer[] | null
|
||||
}
|
||||
interface Layers {
|
||||
levels: Levels
|
||||
}
|
||||
interface CursorPos {
|
||||
x: number
|
||||
y: number
|
||||
}
|
||||
|
||||
|
||||
class Pointers extends Service {
|
||||
|
@ -51,7 +51,7 @@ class Pointers extends Service {
|
|||
|
||||
#process = null as Subprocess | null;
|
||||
#lastLine = '';
|
||||
#pointers = [] as Array<string>;
|
||||
#pointers = [] as string[];
|
||||
|
||||
get process() {
|
||||
return this.#process;
|
||||
|
@ -111,7 +111,7 @@ class Pointers extends Service {
|
|||
#initAppConnection() {
|
||||
App.connect('window-toggled', () => {
|
||||
const anyVisibleAndClosable =
|
||||
(App.windows as Array<PopupWindow>).some((w) => {
|
||||
(App.windows as PopupWindow[]).some((w) => {
|
||||
const closable = w.close_on_unfocus &&
|
||||
!(
|
||||
w.close_on_unfocus === 'none' ||
|
||||
|
@ -132,7 +132,7 @@ class Pointers extends Service {
|
|||
}
|
||||
|
||||
static detectClickedOutside(clickStage: string) {
|
||||
const toClose = ((App.windows as Array<PopupWindow>)).some((w) => {
|
||||
const toClose = ((App.windows as PopupWindow[])).some((w) => {
|
||||
const closable = (
|
||||
w.close_on_unfocus &&
|
||||
w.close_on_unfocus === clickStage
|
||||
|
@ -160,8 +160,8 @@ class Pointers extends Service {
|
|||
'osk',
|
||||
];
|
||||
|
||||
const getNoCloseWidgets = (names: Array<string>) => {
|
||||
const arr = [] as Array<Layer>;
|
||||
const getNoCloseWidgets = (names: string[]) => {
|
||||
const arr = [] as Layer[];
|
||||
|
||||
names.forEach((name) => {
|
||||
arr.push(
|
||||
|
|
|
@ -69,7 +69,7 @@ export default () => {
|
|||
rows.forEach((row) => {
|
||||
row.changed();
|
||||
|
||||
const item = (row.get_children()[0] as AgsAppItem);
|
||||
const item = row.get_children()[0] as AgsAppItem;
|
||||
|
||||
if (item.attribute.app) {
|
||||
const isMatching = fzfResults.some((r) => {
|
||||
|
|
|
@ -3,10 +3,12 @@ import CalendarWidget from './main.ts';
|
|||
import { get_gdkmonitor_from_desc } from '../lib.ts';
|
||||
|
||||
|
||||
const RIGHT_MARGIN = 20;
|
||||
|
||||
export default () => PopupWindow({
|
||||
name: 'calendar',
|
||||
anchor: ['bottom', 'right'],
|
||||
margins: [0, 20, 0, 0],
|
||||
margins: [0, RIGHT_MARGIN, 0, 0],
|
||||
transition: 'slide bottom',
|
||||
gdkmonitor: get_gdkmonitor_from_desc('desc:Acer Technologies Acer K212HQL T3EAA0014201'),
|
||||
|
||||
|
|
|
@ -15,8 +15,8 @@ import { Box as AgsBox } from 'types/widgets/box';
|
|||
|
||||
|
||||
const lock = Lock.prepare_lock();
|
||||
const windows: Map<Gdk.Monitor, Gtk.Window> = new Map();
|
||||
const blurBGs: AgsBox<Gtk.Widget, { geometry: { w: number, h: number }; }>[] = [];
|
||||
const windows = new Map<Gdk.Monitor, Gtk.Window>();
|
||||
const blurBGs: AgsBox<Gtk.Widget, { geometry: { w: number, h: number } }>[] = [];
|
||||
|
||||
const transition_duration = 1000;
|
||||
const WINDOW_MARGINS = -2;
|
||||
|
|
|
@ -3,7 +3,7 @@ import { PopupWindow } from 'global-types';
|
|||
|
||||
|
||||
export default () => {
|
||||
(App.windows as Array<PopupWindow>)
|
||||
(App.windows as PopupWindow[])
|
||||
.filter((w) => w &&
|
||||
w.close_on_unfocus &&
|
||||
w.close_on_unfocus !== 'stay')
|
||||
|
|
|
@ -5,6 +5,9 @@ import Gdk from 'gi://Gdk?version=3.0';
|
|||
import { BaseProps, Widget as AgsWidget } from 'types/widgets/widget';
|
||||
type EventHandler<Self> = (self: Self, event: Gdk.Event) => boolean | unknown;
|
||||
|
||||
// eslint-disable-next-line
|
||||
export interface CursorBox<Child, Attr> extends AgsWidget<Attr> { }
|
||||
|
||||
export type CursorBoxProps<
|
||||
Child extends Gtk.Widget,
|
||||
Attr = unknown,
|
||||
|
@ -26,10 +29,8 @@ export type CursorBoxProps<
|
|||
on_secondary_click_release?: EventHandler<Self>
|
||||
}, Attr>;
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
export interface CursorBox<Child, Attr> extends AgsWidget<Attr> { }
|
||||
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
|
||||
export class CursorBox<Child extends Gtk.Widget, Attr> extends Gtk.EventBox {
|
||||
static {
|
||||
Widget.register(this, {
|
||||
|
|
|
@ -3,7 +3,7 @@ const { get_home_dir } = imports.gi.GLib;
|
|||
|
||||
import GObject from 'types/@girs/gobject-2.0/gobject-2.0';
|
||||
|
||||
type Persist = {
|
||||
interface Persist {
|
||||
name: string
|
||||
gobject: GObject.Object
|
||||
prop: string
|
||||
|
@ -11,7 +11,7 @@ type Persist = {
|
|||
whenTrue?: boolean | string
|
||||
whenFalse?: boolean | string
|
||||
signal?: string
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
export default ({
|
||||
|
|
|
@ -8,6 +8,9 @@ import { Window } from 'resource:///com/github/Aylur/ags/widgets/window.js';
|
|||
import type { WindowProps } from 'types/widgets/window';
|
||||
import type { Widget as AgsWidget } from 'types/widgets/widget';
|
||||
|
||||
// eslint-disable-next-line
|
||||
export interface PopupWindow<Child, Attr> extends AgsWidget<Attr> { }
|
||||
|
||||
import {
|
||||
CloseType,
|
||||
HyprTransition,
|
||||
|
@ -18,17 +21,15 @@ export type PopupWindowProps<
|
|||
Attr = unknown,
|
||||
Self = PopupWindow<Child, Attr>,
|
||||
> = WindowProps<Child, Attr, Self> & {
|
||||
transition?: HyprTransition;
|
||||
on_open?(self: PopupWindow<Child, Attr>): void;
|
||||
on_close?(self: PopupWindow<Child, Attr>): void;
|
||||
close_on_unfocus?: CloseType;
|
||||
anchor?: Array<'top' | 'bottom' | 'right' | 'left'>;
|
||||
transition?: HyprTransition
|
||||
on_open?(self: PopupWindow<Child, Attr>): void
|
||||
on_close?(self: PopupWindow<Child, Attr>): void
|
||||
close_on_unfocus?: CloseType
|
||||
anchor?: ('top' | 'bottom' | 'right' | 'left')[]
|
||||
};
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
export interface PopupWindow<Child, Attr> extends AgsWidget<Attr> { }
|
||||
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
|
||||
export class PopupWindow<
|
||||
Child extends Gtk.Widget,
|
||||
Attr,
|
||||
|
@ -68,6 +69,7 @@ export class PopupWindow<
|
|||
}
|
||||
|
||||
|
||||
// eslint-disable-next-line no-use-before-define
|
||||
protected _on_open: (self: PopupWindow<Child, Attr>) => void;
|
||||
|
||||
get on_open() {
|
||||
|
@ -79,6 +81,7 @@ export class PopupWindow<
|
|||
}
|
||||
|
||||
|
||||
// eslint-disable-next-line no-use-before-define
|
||||
private _on_close: (self: PopupWindow<Child, Attr>) => void;
|
||||
|
||||
get on_close() {
|
||||
|
|
|
@ -9,22 +9,24 @@ import { ListBoxRow } from 'types/@girs/gtk-3.0/gtk-3.0.cjs';
|
|||
import { Monitor } from 'types/service/hyprland';
|
||||
import { Binding } from 'types/service';
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
|
||||
export interface SortedList<Attr> extends AgsWidget<Attr> { }
|
||||
|
||||
// eslint-disable-next-line no-use-before-define
|
||||
type MakeChild = ReturnType<typeof makeChild>;
|
||||
|
||||
type SortedListProps<Attr = unknown, Self = SortedList<Attr>> =
|
||||
PopupWindowProps<MakeChild['child'], Attr, Self> & {
|
||||
on_select: (row: ListBoxRow) => void;
|
||||
init_rows?: (list: MakeChild['list']) => void;
|
||||
on_select: (row: ListBoxRow) => void
|
||||
init_rows?: (list: MakeChild['list']) => void
|
||||
set_sort: (
|
||||
text: string,
|
||||
list: MakeChild['list'],
|
||||
placeholder: MakeChild['placeholder'],
|
||||
) => void;
|
||||
setup_list?: (list: MakeChild['list']) => void;
|
||||
) => void
|
||||
setup_list?: (list: MakeChild['list']) => void
|
||||
};
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
export interface SortedList<Attr> extends AgsWidget<Attr> { }
|
||||
|
||||
|
||||
const centerCursor = async(): Promise<void> => {
|
||||
|
@ -108,6 +110,7 @@ const makeChild = (class_name: string | Binding<any, any, string>) => {
|
|||
};
|
||||
};
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
|
||||
export class SortedList<
|
||||
Attr,
|
||||
> extends PopupWindow<MakeChild['child'], Attr> {
|
||||
|
|
|
@ -14,11 +14,11 @@ import { launchApp } from '../applauncher/launch.ts';
|
|||
// Types
|
||||
import { Notification as NotifObj } from 'types/service/notifications.ts';
|
||||
import { Client } from 'types/service/hyprland.ts';
|
||||
type NotificationWidget = {
|
||||
interface NotificationWidget {
|
||||
notif: NotifObj
|
||||
slideIn?: 'Left' | 'Right'
|
||||
command?(): void
|
||||
};
|
||||
}
|
||||
import {
|
||||
CursorBox as CBox,
|
||||
EventBoxGeneric,
|
||||
|
@ -74,8 +74,8 @@ const NotificationIcon = (notif: NotifObj) => {
|
|||
}
|
||||
else {
|
||||
Hyprland.messageAsync('j/clients').then((msg) => {
|
||||
const clients = JSON.parse(msg) as Array<Client>;
|
||||
const classes = [] as Array<string>;
|
||||
const clients = JSON.parse(msg) as Client[];
|
||||
const classes = [] as string[];
|
||||
|
||||
for (const key of clients) {
|
||||
if (key.class) {
|
||||
|
|
|
@ -28,7 +28,7 @@ export default (window: OskWindow) => {
|
|||
|
||||
window.child.setCss(`margin-bottom: -${HIDDEN_MARGIN}px;`);
|
||||
|
||||
let signals = [] as Array<number>;
|
||||
let signals = [] as number[];
|
||||
|
||||
window.attribute = {
|
||||
startY: null,
|
||||
|
|
|
@ -45,14 +45,14 @@ const LCTRL_CODE = 29;
|
|||
|
||||
// Types
|
||||
import { Variable as Var } from 'types/variable.ts';
|
||||
type Key = {
|
||||
keytype: string,
|
||||
label: string,
|
||||
labelShift?: string,
|
||||
labelAltGr?: string,
|
||||
shape: string,
|
||||
interface Key {
|
||||
keytype: string
|
||||
label: string
|
||||
labelShift?: string
|
||||
labelAltGr?: string
|
||||
shape: string
|
||||
keycode: number
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
const ModKey = (key: Key) => {
|
||||
|
|
|
@ -7,7 +7,7 @@ import PopupWindow from '../misc/popup.ts';
|
|||
import { BoxGeneric } from 'global-types';
|
||||
|
||||
// Import all the OSDs as an array
|
||||
const OSDList = [] as Array<() => BoxGeneric>;
|
||||
const OSDList = [] as (() => BoxGeneric)[];
|
||||
|
||||
import * as Modules from './osds.ts';
|
||||
for (const osd in Modules) {
|
||||
|
|
|
@ -200,7 +200,7 @@ export const BluetoothMenu = () => {
|
|||
}
|
||||
|
||||
// Trigger sort_func
|
||||
(self.get_children() as Array<ListBoxRow>)
|
||||
(self.get_children() as ListBoxRow[])
|
||||
.forEach((ch) => {
|
||||
ch.changed();
|
||||
});
|
||||
|
|
|
@ -36,7 +36,7 @@ type IndicatorTuple = [
|
|||
signal?: string,
|
||||
];
|
||||
|
||||
type GridButtonType = {
|
||||
interface GridButtonType {
|
||||
command?(): void
|
||||
secondary_command?(): void
|
||||
on_open?(menu: RevealerGeneric): void
|
||||
|
@ -44,12 +44,12 @@ type GridButtonType = {
|
|||
indicator?: IndicatorTuple
|
||||
// @ts-expect-error me is lazy
|
||||
menu?: Widget
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
// TODO: do vpn button
|
||||
const SPACING = 28;
|
||||
const ButtonStates = [] as Array<Var<boolean>>;
|
||||
const ButtonStates = [] as Var<boolean>[];
|
||||
|
||||
const GridButton = ({
|
||||
command = () => { /**/ },
|
||||
|
@ -158,7 +158,7 @@ const GridButton = ({
|
|||
?.children[1] as BoxGeneric;
|
||||
|
||||
const isSetup = (rowMenu
|
||||
.get_children() as Array<BoxGeneric>)
|
||||
.get_children() as BoxGeneric[])
|
||||
.find((ch) => ch === menu);
|
||||
|
||||
if (!isSetup) {
|
||||
|
|
|
@ -150,7 +150,7 @@ export const NetworkMenu = () => {
|
|||
self.hook(Network, () => {
|
||||
// Add missing APs
|
||||
const currentAPs = Network.wifi
|
||||
?.access_points as Array<APType>;
|
||||
?.access_points as APType[];
|
||||
|
||||
currentAPs.forEach((ap) => {
|
||||
if (ap.ssid !== 'Unknown') {
|
||||
|
@ -227,7 +227,7 @@ export const NetworkMenu = () => {
|
|||
}
|
||||
|
||||
// Trigger sort_func
|
||||
(self.get_children() as Array<ListBoxRow>)
|
||||
(self.get_children() as ListBoxRow[])
|
||||
.forEach((ch) => {
|
||||
ch.changed();
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue