support the larger refactoring for notifications per app group fro gnome 48:

see https://gjs.guide/extensions/upgrading/gnome-shell-48.html#notifications-per-app-group

Author: Totto16

Diff for: packages/gnome-shell/src/ui/calendar.d.ts

@@ -5,10 +5,8 @@ import type Gio from '@girs/gio-2.0';
 import type St from '@girs/st-16';
 import type Clutter from '@girs/clutter-16';
 
-import type { Message, MessageListSection } from './messageList.js';
-import type { Notification, MessageTray, Source } from './messageTray.js';
 import type { Switch } from './popupMenu.js';
-import type { MediaSection } from './mpris.js';
+import type { MessageView } from './messageList.js';
 
 declare function sameYear(dateA: Date, dateB: Date): boolean;
 
@@ -109,6 +107,10 @@ declare class DBusEventSource extends EventSourceBase {
     protected _getFilteredEvents(begin: Date, end: Date): Generator<CalendarEvent, void, unknown>;
 }
 
+/**
+ * @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/calendar.js#L406
+ * @version 48
+ */
 export class Calendar extends St.Widget {
     protected _weekStart: number;
     protected _settings: Gio.Settings;
@@ -162,43 +164,6 @@ export class Calendar extends St.Widget {
     protected _update(): void;
 }
 
-export class NotificationMessage extends Message {
-    /** @hidden */
-    override _init(params?: Partial<St.Button.ConstructorProps>): void;
-    /** @hidden */
-    override _init(title: string, body: string): void;
-    public _init(notification: Notification): void;
-
-    public vfunc_clicked(): void;
-    public canClose(): boolean;
-
-    protected _getIcon(): St.Icon;
-    protected _onUpdated(n: Notification, _clear?: boolean): void;
-}
-
-declare class TimeLabel extends St.Label {
-    _datetime: Date;
-
-    /** @hidden */
-    public _init(params?: Partial<St.Label.ConstructorProps>): void;
-    public _init(datetime: Date): void;
-
-    public vfunc_map(): void;
-}
-
-declare class NotificationSection extends MessageListSection {
-    public readonly allowed: boolean;
-
-    /** @hidden */
-    public _init(params?: Partial<St.BoxLayout.ConstructorProps>): void;
-    public _init(): void;
-
-    public vfunc_map(): void;
-
-    protected _sourceAdded(tray: MessageTray, source: Source): void;
-    protected _onNotificationAdded(source: Source, notification: Notification): void;
-}
-
 declare class Placeholder extends St.BoxLayout {
     protected _date: Date;
     protected _icon: St.Icon;
@@ -220,22 +185,24 @@ declare class DoNotDisturbSwitch extends Switch {
     public _init(): void;
 }
 
+/**
+ * @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/calendar.js#L799
+ * @version 48
+ */
+
 export class CalendarMessageList extends St.Widget {
     _placeholder: Placeholder;
     _scrollView: St.ScrollView;
     _dndSwitch: DoNotDisturbSwitch;
     _dndButton: St.Button;
     _clearButton: St.Button;
-    _sectionList: St.BoxLayout;
-    _mediaSection: MediaSection;
-    _notificationSection: NotificationSection;
+    _messageView: MessageView;
 
     // visible: boolean;
 
     /** @hidden */
     override _init(config?: Partial<St.Widget.ConstructorProps>): void;
     public _init(): void;
 
-    protected _addSection(section: MessageListSection): void;
-    protected _sync(): void;
+    maybeCollapseMessageGroupForEvent(event: Clutter.Event): boolean;
 }

Diff for: packages/gnome-shell/src/ui/messageList.d.ts

@@ -5,9 +5,12 @@ import type Gio from '@girs/gio-2.0';
 import type GLib from '@girs/glib-2.0';
 import type St from '@girs/st-16';
 import type Clutter from '@girs/clutter-16';
+import type { Notification } from './messageTray';
+import type { MprisPlayer, MprisSource } from './mpris';
 
 /**
- * @version 46
+ * @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/messageList.js#L33
+ * @version 48
  */
 export class URLHighlighter extends St.Label {
     constructor(text?: string, lineWrap?: boolean, allowMarkup?: boolean);
@@ -26,6 +29,36 @@ export class URLHighlighter extends St.Label {
     protected _findUrlAtPos(event: Clutter.Event): [number, number];
 }
 
+declare class ScaleLayout extends Clutter.BinLayout {
+    _container: Clutter.Actor | null;
+    _scalingEnabled: boolean;
+
+    get scalingEnabled(): boolean;
+
+    set scalingEnabled(value: boolean);
+
+    vfunc_set_container(container: Clutter.Actor | null): void;
+
+    vfunc_get_preferred_width(container: Clutter.Actor, forHeight: number): [number, number];
+
+    vfunc_get_preferred_height(container: Clutter.Actor, forWidth: number): [number, number];
+}
+
+declare class LabelExpanderLayout extends Clutter.BinLayout {
+    _expansion: number;
+    _expandLines: number;
+
+    constructor(params: Clutter.BinLayout.ConstructorProps);
+
+    get expansion(): number;
+
+    set expansion(v: number);
+
+    set expandLines(v: number);
+
+    vfunc_get_preferred_height(container: Clutter.Actor, forWidth: number): [number, number];
+}
+
 export declare namespace Source {
     interface ObjectProperties {
         title: string;
@@ -37,7 +70,8 @@ export declare namespace Source {
 }
 
 /**
- * @version 46
+ * @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/messageList.js#L284
+ * @version 48
  */
 export class Source extends GObject.Object implements Source.ObjectProperties {
     constructor(params?: Source.ConstructorProps);
@@ -50,8 +84,27 @@ export class Source extends GObject.Object implements Source.ObjectProperties {
     public set iconName(iconName: string);
 }
 
+declare class TimeLabel extends St.Label {
+    _datetime: Date;
+
+    /** @hidden */
+    public _init(params?: Partial<St.Label.ConstructorProps>): void;
+    public _init(datetime: Date): void;
+
+    get datetime(): Date;
+
+    set datetime(datetime: Date);
+
+    public vfunc_map(): void;
+}
+
+declare class MessageHeader extends St.BoxLayout {
+    constructor(source: Source);
+}
+
 /**
- * @version 46
+ * @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/messageList.js#L421
+ * @version 48
  */
 export class Message extends St.Button {
     constructor(source: Source);
@@ -77,30 +130,180 @@ export class Message extends St.Button {
     public canClose(): boolean;
 
     public vfunc_key_press_event(keyEvent: Clutter.KeyEvent): boolean;
+}
+
+/**
+ * @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/messageList.js#L691
+ * @version 48
+ */
+export class NotificationMessage extends Message {
+    /** @hidden */
+    override _init(params?: Partial<St.Button.ConstructorProps>): void;
+    /** @hidden */
+    override _init(title: string, body: string): void;
+    public _init(notification: Notification): void;
+
+    public vfunc_clicked(): void;
+    public canClose(): boolean;
+
+    protected _getIcon(): St.Icon;
+    protected _onUpdated(n: Notification, _clear?: boolean): void;
+}
+
+declare class MediaMessage extends Message {
+    protected _player: MprisPlayer;
+    protected _icon: St.Icon;
+    protected _secondaryBin: St.Bin;
+    protected _closeButton: St.Button;
+    protected _prevButton: St.Button;
+    protected _playPauseButton: St.Button;
+    protected _nextButton: St.Button;
+
+    constructor(player: MprisPlayer);
+
+    /** @hidden */
+    public override _init(params?: Partial<St.Button.ConstructorProps>): void;
+    /** @hidden */
+    public override _init(title: string, body: string): void;
+    public _init(player: MprisPlayer): void;
+
+    public vfunc_clicked(): void;
+
+    protected _updateNavButton(button: St.Button, sensitive?: boolean): void;
+    protected _update(): void;
+}
+
+declare class NotificationMessageGroup extends St.Widget {
+    source: Source;
+    _expanded: boolean;
+    _nUrgent: number;
+    _focusChild: null | Clutter.Actor;
+
+    constructor(source: Source);
 
-    protected _onDestroy(): void;
+    get expanded(): boolean;
+
+    get hasUrgent(): boolean;
+
+    _onKeyFocusIn(actor: Clutter.Actor): void;
+
+    get focusChild(): null | Clutter.Actor;
+
+    expand(): Promise<void>;
+
+    collapse(): Promise<void>;
+
+    get expandedHeight(): number;
+
+    _ensureCoverPosition(): void;
+
+    _updateStackedMessagesFade(): void;
+
+    canClose(): boolean;
+
+    _addNotification(notification: Notification): void;
+
+    _removeNotification(notification: Notification): void;
+
+    vfunc_paint(paintContext: Clutter.PaintContext): void;
+
+    vfunc_pick(pickContext: Clutter.PickContext): void;
+
+    vfunc_map(): void;
+
+    vfunc_get_focus_chain(): Clutter.Actor[];
+
+    _moveMessage(message: Message, index: number): void;
+
+    close(): void;
+}
+
+declare class MessageGroupExpanderLayout extends Clutter.LayoutManager {
+    _expansion: number;
+
+    constructor(cover: Clutter.Actor, header: MessageHeader);
+
+    get expansion(): number;
+
+    set expansion(v: number);
+
+    getExpandedHeight(container: Clutter.Actor, forWidth: number): [number, number];
+
+    vfunc_get_preferred_width(container: Clutter.Actor, forHeight: number): [number, number];
+
+    vfunc_get_preferred_height(container: Clutter.Actor, forWidth: number): [number, number];
+
+    vfunc_allocate(container: Clutter.Actor, box: Clutter.ActorBox): void;
+}
+declare class MessageViewLayout extends Clutter.LayoutManager {
+    constructor(overlay: Clutter.Actor);
+
+    vfunc_get_preferred_width(container: Clutter.Actor, forHeight: number): [number, number];
+
+    vfunc_get_preferred_height(container: Clutter.Actor, forWidth: number): [number, number];
+
+    vfunc_allocate(container: Clutter.Actor, box: Clutter.ActorBox): void;
 }
 
 /**
- * @version 46
+ * @see https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/messageList.js#L1391
+ * @version 48
  */
-export class MessageListSection extends St.BoxLayout {
-    public readonly canClear: boolean;
-    public readonly empty: boolean;
+export class MessageView extends St.Viewport {
+    messages: Message[];
+
+    _nUrgent: number;
+    _mediaSource: MprisSource;
+    _overlay: Clutter.Actor;
+    _expandedGroup: NotificationMessageGroup | null;
+
+    get empty(): boolean;
+
+    get canClear(): boolean;
+
+    _onKeyFocusIn(messageActor: Clutter.Actor): void;
+
+    vfunc_get_focus_chain(): Clutter.Actor[];
+
+    _addMessageAtIndex(message: Message, index: number): void;
+
+    _moveMessage(message: Message, index: number): void;
+
+    _removeMessage(message: Message): void;
+
+    clear(): void;
+
+    // When a group is expanded the user isn't allowed to scroll outside the expanded group,
+    // therefore the adjustment used by the MessageView needs to be different then the external
+    // adjustment used by the scrollbar and scrollview.
+    vfunc_set_adjustments(hadjustment: St.Adjustment, vadjustment: St.Adjustment): void;
+
+    vfunc_allocate(box: Clutter.ActorBox): void;
+
+    vfunc_style_changed(): void;
+
+    _setupMpris(): void;
+
+    _addPlayer(player: MprisPlayer): void;
+
+    _removePlayer(player: MprisPlayer): void;
+
+    _setupNotifications(): void;
 
-    public readonly allowed: boolean;
+    _addNotificationSource(source: Source): void;
 
-    constructor();
+    _removeNotificationSource(source: Source): void;
 
-    public addMessage(message: Message, animate?: boolean): void;
+    // Try to center the expanded group in the available space
+    _scrollToExpandedGroup(): void;
 
-    public addMessageAtIndex(message: Message, index: number, animate?: boolean): void;
+    get expandedGroup(): NotificationMessageGroup | null;
 
-    public moveMessage(message: Message, newIndex: number, animate?: boolean): void;
+    _setExpandedGroup(group: NotificationMessageGroup | null): Promise<void>;
 
-    public removeMessage(message: Message, animate?: boolean): void;
+    collapse(): void;
 
-    public clear(): void;
+    _highlightGroup(group: NotificationMessageGroup): void;
 
-    protected _onKeyFocusIn(messageActor: St.Widget): void;
+    _unhighlightGroup(): void;
 }