@codingame/monaco-vscode-katex-common 26.2.2 → 28.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-katex-common",
-  "version": "26.2.2",
+  "version": "28.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - common package depending on katex",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "26.2.2",
+    "@codingame/monaco-vscode-api": "28.0.0",
     "katex": "0.16.27",
     "marked": "14.0.0"
   },

package/vscode/src/vs/platform/actionWidget/browser/actionWidgetDropdown.d.ts

@@ -1,7 +1,7 @@
 import { IActionWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service";
 import { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
 import { BaseDropdown, IActionProvider, IBaseDropdownOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/dropdown/dropdown";
-import { IActionListItemHover } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionList";
+import { IActionListItemHover, IActionListOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionList";
 import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
@@ -33,13 +33,19 @@ export interface IActionWidgetDropdownOptions extends IBaseDropdownOptions {
     readonly showItemKeybindings?: boolean;
     getAnchor?: () => HTMLElement;
     /**
-     * Name used for telemetry tracking when the dropdown closes.
-     * If not provided, no telemetry will be sent.
+     * Telemetry reporter configuration used when the dropdown closes. The `id` field is required
+     * and is used as the telemetry identifier; `name` is optional additional context. If not
+     * provided, no telemetry will be sent.
      */
     readonly reporter?: {
-        name: string;
+        id: string;
+        name?: string;
         includeOptions?: boolean;
     };
+    /**
+     * Options for the underlying ActionList (filter, collapsible sections).
+     */
+    readonly listOptions?: IActionListOptions;
 }
 /**
  * Action widget dropdown is a dropdown that uses the action widget under the hood to simulate a native dropdown menu

package/vscode/src/vs/platform/actionWidget/browser/actionWidgetDropdown.js

@@ -28,7 +28,7 @@ let ActionWidgetDropdown = class ActionWidgetDropdown extends BaseDropdown {
         if (!this._enabled) {
             return;
         }
-        let actionBarActions = this._options.actionBarActions ?? this._options.actionBarActionProvider?.getActions() ?? [];
+        const actionBarActions = this._options.actionBarActions ?? this._options.actionBarActionProvider?.getActions() ?? [];
         const actions = this._options.actions ?? this._options.actionProvider?.getActions() ?? [];
         const optionBeforeOpen = actions.find(a => a.checked);
         let selectedOption = optionBeforeOpen;
@@ -94,26 +94,49 @@ let ActionWidgetDropdown = class ActionWidgetDropdown extends BaseDropdown {
             }
         }
         const previouslyFocusedElement = getActiveElement();
+        const auxiliaryActionIds = ( new Set(( actionBarActions.map(action => action.id))));
         const actionWidgetDelegate = {
             onSelect: (action, preview) => {
-                selectedOption = action;
+                if (!( auxiliaryActionIds.has(action.id))) {
+                    selectedOption = action;
+                }
                 this.actionWidgetService.hide();
                 action.run();
             },
             onHide: () => {
+                this.hide();
                 if (isHTMLElement(previouslyFocusedElement)) {
                     previouslyFocusedElement.focus();
                 }
                 this._emitCloseEvent(optionBeforeOpen, selectedOption);
             }
         };
-        actionBarActions = ( actionBarActions.map(action => ({
-            ...action,
-            run: async (...args) => {
-                this.actionWidgetService.hide();
-                return action.run(...args);
+        if (actionBarActions.length) {
+            if (actionWidgetItems.length) {
+                actionWidgetItems.push({
+                    label: "",
+                    kind: ActionListItemKind.Separator,
+                    canPreview: false,
+                    disabled: false,
+                    hideIcon: false
+                });
+            }
+            for (const action of actionBarActions) {
+                actionWidgetItems.push({
+                    item: action,
+                    tooltip: action.tooltip,
+                    kind: ActionListItemKind.Action,
+                    canPreview: false,
+                    group: {
+                        title: "",
+                        icon: ThemeIcon.fromId(Codicon.blank.id)
+                    },
+                    disabled: !action.enabled,
+                    hideIcon: false,
+                    label: action.label
+                });
             }
-        })));
+        }
         const accessibilityProvider = {
             isChecked(element) {
                 return element.kind === ActionListItemKind.Action && !!element?.item?.checked;
@@ -121,7 +144,7 @@ let ActionWidgetDropdown = class ActionWidgetDropdown extends BaseDropdown {
             getRole: e => {
                 switch (e.kind) {
                 case ActionListItemKind.Action:
-                    return "menuitemcheckbox";
+                    return e.item && ( auxiliaryActionIds.has(e.item.id)) ? "menuitem" : "menuitemcheckbox";
                 case ActionListItemKind.Separator:
                     return "separator";
                 default:
@@ -130,6 +153,7 @@ let ActionWidgetDropdown = class ActionWidgetDropdown extends BaseDropdown {
             },
             getWidgetRole: () => "menu"
         };
+        super.show();
         this.actionWidgetService.show(
             this._options.label ?? "",
             false,
@@ -137,8 +161,9 @@ let ActionWidgetDropdown = class ActionWidgetDropdown extends BaseDropdown {
             actionWidgetDelegate,
             this._options.getAnchor?.() ?? this.element,
             undefined,
-            actionBarActions,
-            accessibilityProvider
+            [],
+            accessibilityProvider,
+            this._options.listOptions
         );
     }
     setEnabled(enabled) {
@@ -149,6 +174,7 @@ let ActionWidgetDropdown = class ActionWidgetDropdown extends BaseDropdown {
         const optionAfter = selectedOption;
         if (this._options.reporter) {
             this.telemetryService.publicLog2("actionWidgetDropdownClosed", {
+                id: this._options.reporter.id,
                 name: this._options.reporter.name,
                 selectionChanged: optionBefore?.id !== optionAfter?.id,
                 optionIdBefore: this._options.reporter.includeOptions ? optionBefore?.id : undefined,

package/vscode/src/vs/platform/actions/browser/buttonbar.d.ts

@@ -1,6 +1,7 @@
 import { ButtonBar } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button";
 import { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IToolBarRenderOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar";
 import { MenuId, IMenuActionOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
@@ -14,6 +15,8 @@ export type IButtonConfigProvider = (action: IAction, index: number) => {
     showIcon?: boolean;
     showLabel?: boolean;
     isSecondary?: boolean;
+    customLabel?: string | IMarkdownString;
+    customClass?: string;
 } | undefined;
 export interface IWorkbenchButtonBarOptions {
     telemetrySource?: string;

package/vscode/src/vs/platform/actions/browser/buttonbar.js

@@ -5,6 +5,7 @@ import { createInstantHoverDelegate } from '@codingame/monaco-vscode-api/vscode/
 import { ActionRunner, SubmenuAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { MarkdownString, isMarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -92,8 +93,13 @@ let WorkbenchButtonBar = class WorkbenchButtonBar extends ButtonBar {
             btn.checked = action.checked ?? false;
             btn.element.classList.add("default-colors");
             const showLabel = conifgProvider(action, i)?.showLabel ?? true;
+            const customClass = conifgProvider(action, i)?.customClass;
+            const customLabel = conifgProvider(action, i)?.customLabel;
+            if (customClass) {
+                btn.element.classList.add(customClass);
+            }
             if (showLabel) {
-                btn.label = action.label;
+                btn.label = customLabel ?? action.label;
             } else {
                 btn.element.classList.add("monaco-text-button");
             }
@@ -102,7 +108,12 @@ let WorkbenchButtonBar = class WorkbenchButtonBar extends ButtonBar {
                     if (!showLabel) {
                         btn.icon = action.item.icon;
                     } else {
-                        btn.label = `$(${action.item.icon.id}) ${action.label}`;
+                        const labelValue = customLabel ?? action.label;
+                        btn.label = isMarkdownString(labelValue) ? ( new MarkdownString(`$(${action.item.icon.id}) ${labelValue.value}`, {
+                            isTrusted: labelValue.isTrusted,
+                            supportThemeIcons: true,
+                            supportHtml: labelValue.supportHtml
+                        })) : `$(${action.item.icon.id}) ${labelValue}`;
                     }
                 } else if (action.class) {
                     btn.element.classList.add(...action.class.split(" "));
@@ -125,14 +136,14 @@ let WorkbenchButtonBar = class WorkbenchButtonBar extends ButtonBar {
         if (secondary.length > 0) {
             const btn = this.addButton({
                 secondary: true,
-                ariaLabel: ( localize(1758, "More Actions")),
+                ariaLabel: ( localize(1792, "More Actions")),
                 small: this._options?.small
             });
             btn.icon = Codicon.dropDownButton;
             btn.element.classList.add("default-colors", "monaco-text-button");
             btn.enabled = true;
             this._updateStore.add(
-                this._hoverService.setupManagedHover(hoverDelegate, btn.element, ( localize(1758, "More Actions")))
+                this._hoverService.setupManagedHover(hoverDelegate, btn.element, ( localize(1792, "More Actions")))
             );
             this._updateStore.add(btn.onDidClick(async () => {
                 this._contextMenuService.showContextMenu({