Skip to content

Commit 1c887ab

Browse files
swsnrswsnr
committed
Check popup menu module for GNOME 47
1 parent 3551f96 commit 1c887ab

File tree

2 files changed

+38
-27
lines changed

2 files changed

+38
-27
lines changed

‎packages/gnome-shell/src/ui/popupMenu.d.ts

+36-27
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import * as BoxPointer from './boxpointer.js';
1010

1111
/**
1212
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L16
13-
* @version 46
13+
* @version 47
1414
*/
1515
export enum Ornament {
1616
NONE = 0,
@@ -22,20 +22,20 @@ export enum Ornament {
2222

2323
/**
2424
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L39
25-
* @version 46
25+
* @version 47
2626
*/
2727
export function arrowIcon(side: St.Side): St.Icon;
2828

2929
/**
3030
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L67
31-
* @version 46
31+
* @version 47
3232
*/
3333
declare namespace PopupBaseMenuItem {
3434
export interface ConstructorProps {
3535
reactive: boolean;
3636
activate: boolean;
3737
hover: boolean;
38-
style_class: string;
38+
style_class: string | null;
3939
can_focus: boolean;
4040
}
4141
}
@@ -50,7 +50,7 @@ declare class PopupBaseMenuItem extends St.BoxLayout {
5050
sensitive: boolean;
5151

5252
constructor(params?: Partial<PopupBaseMenuItem.ConstructorProps>);
53-
override _init(...args: any[]): void;
53+
override _init(params?: Partial<PopupBaseMenuItem.ConstructorProps>): void;
5454

5555
activate(event: Clutter.Event): void;
5656

@@ -72,37 +72,41 @@ declare class PopupBaseMenuItem extends St.BoxLayout {
7272

7373
/**
7474
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L285
75-
* @version 46
75+
* @version 47
7676
*/
7777
export namespace PopupMenuItem {
7878
export interface ConstructorProps extends PopupBaseMenuItem.ConstructorProps {}
7979
}
8080

8181
/**
8282
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L286
83-
* @version 46
83+
* @version 47
8484
*/
8585
export class PopupMenuItem extends PopupBaseMenuItem {
8686
constructor(text: string, params?: Partial<PopupMenuItem.ConstructorProps>);
87+
/** @hidden Defined only to resolve type conflicts */
88+
override _init(config?: PopupMenuItem.ConstructorProps): void;
8789
override _init(text: string, params?: Partial<PopupMenuItem.ConstructorProps>): void;
8890

8991
readonly label: St.Label;
9092
}
9193

9294
/**
9395
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L302
94-
* @version 46
96+
* @version 47
9597
*/
9698
export class PopupSeparatorMenuItem extends PopupBaseMenuItem {
9799
constructor(text?: string);
100+
/** @hidden Defined only to resolve type conflicts */
101+
override _init(config?: PopupBaseMenuItem.ConstructorProps): void;
98102
override _init(text?: string): void;
99103

100104
readonly label: St.Label;
101105
}
102106

103107
/**
104108
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L332
105-
* @version 46
109+
* @version 47
106110
*/
107111
export namespace Switch {
108112
export interface ConstructorProps extends St.Bin.ConstructorProps {
@@ -112,7 +116,7 @@ export namespace Switch {
112116

113117
/**
114118
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L339
115-
* @version 46
119+
* @version 47
116120
*/
117121
export class Switch extends St.Bin {
118122
state: boolean;
@@ -121,7 +125,6 @@ export class Switch extends St.Bin {
121125
override _init(config?: Switch.ConstructorProps): void;
122126
override _init(state: boolean): void;
123127

124-
setToggleState(state: boolean): void;
125128
toggle(): void;
126129

127130
// General signal handler methods
@@ -137,20 +140,22 @@ export class Switch extends St.Bin {
137140

138141
/**
139142
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L415
140-
* @version 46
143+
* @version 47
141144
*/
142145
export namespace PopupSwitchMenuItem {
143146
export interface ConstructorProps extends PopupBaseMenuItem.ConstructorProps {}
144147
}
145148

146149
/**
147150
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L417
148-
* @version 46
151+
* @version 47
149152
*/
150153
export class PopupSwitchMenuItem extends PopupBaseMenuItem {
151154
readonly state: boolean;
152155

153156
constructor(text: string, active: boolean, params?: PopupSwitchMenuItem.ConstructorProps);
157+
/** @hidden Defined only to resolve type conflicts */
158+
override _init(config?: PopupSwitchMenuItem.ConstructorProps): void;
154159
override _init(text: string, active: boolean, params?: PopupSwitchMenuItem.ConstructorProps): void;
155160

156161
setStatus(text: string): void;
@@ -180,18 +185,20 @@ export namespace PopupImageMenuItem {
180185

181186
/**
182187
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L506
183-
* @version 46
188+
* @version 47
184189
*/
185190
export class PopupImageMenuItem extends PopupBaseMenuItem {
186191
constructor(text: string, icon: Gio.Icon | string, params?: PopupImageMenuItem.ConstructorProps);
187-
override _init(text: string, icon: Gio.Icon | string, params?: PopupImageMenuItem.ConstructorProps): void;
192+
/** @hidden Defined only to resolve type conflicts */
193+
override _init(config?: PopupImageMenuItem.ConstructorProps): void;
194+
override _init(text: string, icon: Gio.Icon | string, params?: PopupImageMenuItem.ConstructorProps): void;
188195

189196
setIcon(icon: Gio.Icon | string): void;
190197
}
191198

192199
/**
193200
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L542
194-
* @version 46
201+
* @version 47
195202
*/
196203
export namespace PopupMenuBase {
197204
interface SignalMap {}
@@ -203,7 +210,7 @@ export namespace PopupMenuBase {
203210

204211
/**
205212
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L542
206-
* @version 46
213+
* @version 47
207214
*/
208215
export class PopupMenuBase<S extends Signals.SignalMap<S> = PopupMenuBase.SignalMap> extends Signals.EventEmitter<S> {
209216
protected constructor(sourceActor: St.Widget, styleClass?: string);
@@ -217,7 +224,6 @@ export class PopupMenuBase<S extends Signals.SignalMap<S> = PopupMenuBase.Signal
217224
readonly firstMenuItem: PopupBaseMenuItem | PopupMenuSection;
218225
readonly numMenuItems: number;
219226

220-
_getMenuItems(): (PopupBaseMenuItem | PopupMenuSection)[];
221227
getSensitive(): boolean;
222228
setSensitive(sensitive: boolean): void;
223229
addAction(title: string, callback: () => void, icon?: Gio.Icon): void;
@@ -226,22 +232,23 @@ export class PopupMenuBase<S extends Signals.SignalMap<S> = PopupMenuBase.Signal
226232
itemActivated(animate: boolean): void;
227233
moveMenuItem(item: PopupMenuBase.MenuItemType, position: number): void;
228234
addMenuItem(item: PopupMenuBase.MenuItemType, position?: number): void;
235+
_getMenuItems(): (PopupBaseMenuItem | PopupMenuSection)[];
229236
removeAll(): void;
230237
toggle(): void;
231238
destroy(): void;
232239
}
233240

234241
/**
235242
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L871
236-
* @version 46
243+
* @version 47
237244
*/
238245
export namespace PopupMenu {
239246
interface SignalMap extends PopupMenuBase.SignalMap {}
240247
}
241248

242249
/**
243250
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L871
244-
* @version 46
251+
* @version 47
245252
*/
246253
export class PopupMenu<S extends Signals.SignalMap<S> = PopupMenu.SignalMap> extends PopupMenuBase<S> {
247254
constructor(sourceActor: St.Widget, arrowAlignment: number, arrowSide: St.Side);
@@ -256,7 +263,7 @@ export class PopupMenu<S extends Signals.SignalMap<S> = PopupMenu.SignalMap> ext
256263

257264
/**
258265
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L1015
259-
* @version 46
266+
* @version 47
260267
*/
261268
export class PopupDummyMenu extends Signals.EventEmitter {
262269
constructor(sourceActor: St.Widget);
@@ -273,15 +280,15 @@ export class PopupDummyMenu extends Signals.EventEmitter {
273280

274281
/**
275282
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L1053
276-
* @version 46
283+
* @version 47
277284
*/
278285
export namespace PopupSubMenu {
279286
interface SignalMap extends PopupMenuBase.SignalMap {}
280287
}
281288

282289
/**
283290
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L1053
284-
* @version 46
291+
* @version 47
285292
*/
286293
export class PopupSubMenu<S extends Signals.SignalMap<S> = PopupSubMenu.SignalMap> extends PopupMenuBase<S> {
287294
actor: St.ScrollView;
@@ -297,7 +304,7 @@ export class PopupSubMenu<S extends Signals.SignalMap<S> = PopupSubMenu.SignalMa
297304

298305
/**
299306
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L1192
300-
* @version 46
307+
* @version 47
301308
*/
302309
export namespace PopupMenuSection {
303310
interface SignalMap extends PopupMenuBase.SignalMap {}
@@ -312,7 +319,7 @@ export namespace PopupMenuSection {
312319
* to the user
313320
*
314321
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L1192
315-
* @version 46
322+
* @version 47
316323
*/
317324
export class PopupMenuSection<S extends Signals.SignalMap<S> = PopupMenuSection.SignalMap> extends PopupMenuBase<S> {
318325
constructor();
@@ -325,14 +332,16 @@ export class PopupMenuSection<S extends Signals.SignalMap<S> = PopupMenuSection.
325332

326333
/**
327334
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L1215
328-
* @version 46
335+
* @version 47
329336
*/
330337
export class PopupSubMenuMenuItem extends PopupBaseMenuItem {
331338
readonly menu: PopupSubMenu;
332339

333340
readonly label: St.Label;
334341

335342
constructor(text: string, wantIcon?: boolean);
343+
/** @hidden Defined only to resolve type conflicts */
344+
override _init(config?: PopupBaseMenuItem.ConstructorProps): void;
336345
override _init(text: string, wantIcon?: boolean): void;
337346

338347
syncSensitive(): boolean;
@@ -342,7 +351,7 @@ export class PopupSubMenuMenuItem extends PopupBaseMenuItem {
342351

343352
/**
344353
* @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/popupMenu.js#L1321
345-
* @version 46
354+
* @version 47
346355
*/
347356
export namespace PopupMenuManager {
348357
export interface ConstructorProps {

‎packages/gnome-shell/src/ui/status/keyboard.d.ts

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ export declare class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem {
1919
label: St.Label;
2020
indicator: St.Label;
2121

22+
/** @hidden Defined only to resolve type conflicts */
23+
override _init(config?: PopupMenu.PopupBaseMenuItem.ConstructorProps): void;
2224
/**
2325
* Initializes a new instance of `LayoutMenuItem`.
2426
*/

0 commit comments

Comments
 (0)