@gooddata/sdk-ui-kit 11.36.0-alpha.6 → 11.36.0

package/esm/@ui/UiMenu/hooks.js

@@ -16,7 +16,7 @@ import { getClosestFocusableSibling, getFocusableItem, getItemInteractiveParent,
  * @internal
  */
 export function useUiMenuContextValue(props, menuComponentRef, itemsContainerRef) {
-    const { items, size = "medium", itemDataTestId, onSelect, onLevelChange, onClose, InteractiveItem: InteractiveItemComponent = DefaultUiMenuInteractiveItem, InteractiveItemWrapper: InteractiveItemWrapperComponent = DefaultUiMenuInteractiveItemWrapper, StaticItem: StaticItemComponent = DefaultUiMenuStaticItem, GroupItem: GroupItemComponent = DefaultUiMenuGroupItem, MenuHeader: MenuHeaderComponent = DefaultUiMenuHeader, ContentItem: ContentItemComponent = DefaultUiMenuContentItem, ContentItemWrapper: ContentItemWrapperComponent = DefaultUiMenuContentItemWrapper, Content: ContentComponent = DefaultUiMenuContent, shouldCloseOnSelect = true, isDisabledFocusable = true, ariaAttributes, menuCtxData, } = props;
+    const { items, size = "medium", itemDataTestId, onSelect, onLeaveLevel, onEnterLevel, onLevelChange, onClose, InteractiveItem: InteractiveItemComponent = DefaultUiMenuInteractiveItem, InteractiveItemWrapper: InteractiveItemWrapperComponent = DefaultUiMenuInteractiveItemWrapper, StaticItem: StaticItemComponent = DefaultUiMenuStaticItem, GroupItem: GroupItemComponent = DefaultUiMenuGroupItem, MenuHeader: MenuHeaderComponent = DefaultUiMenuHeader, ContentItem: ContentItemComponent = DefaultUiMenuContentItem, ContentItemWrapper: ContentItemWrapperComponent = DefaultUiMenuContentItemWrapper, Content: ContentComponent = DefaultUiMenuContent, shouldCloseOnSelect = true, isDisabledFocusable = true, ariaAttributes, menuCtxData, } = props;
     const [controlType, setControlType] = useState("unknown");
     const isItemFocusable = useCallback((item) => {
         if (!item || (item.type !== "interactive" && item.type !== "content")) {
@@ -128,6 +128,8 @@ export function useUiMenuContextValue(props, menuComponentRef, itemsContainerRef
         items,
         size,
         onSelect: handleSelectItem,
+        onLeaveLevel,
+        onEnterLevel,
         itemDataTestId,
         isItemFocusable,
         makeItemId,
@@ -171,6 +173,8 @@ export function useUiMenuContextValue(props, menuComponentRef, itemsContainerRef
         shownCustomContentItemId,
         shownSubview,
         size,
+        onLeaveLevel,
+        onEnterLevel,
     ]);
 }
 /**
@@ -222,7 +226,10 @@ export function useKeyNavigation({ menuContextValue, shouldKeyboardActionPrevent
             onSelect(focusedItem, e);
         },
         onEnterLevel: (e) => {
-            const { onSelect, focusedItem } = menuContextRef.current;
+            const { onSelect, onEnterLevel, focusedItem } = menuContextRef.current;
+            if (onEnterLevel?.(focusedItem, e)) {
+                return;
+            }
             if ((focusedItem?.type !== "interactive" && focusedItem?.type !== "content") ||
                 (focusedItem?.type === "interactive" && !focusedItem.subItems) ||
                 (focusedItem?.type === "content" && !focusedItem.Component)) {
@@ -230,8 +237,11 @@ export function useKeyNavigation({ menuContextValue, shouldKeyboardActionPrevent
             }
             onSelect(focusedItem, e);
         },
-        onLeaveLevel: () => {
-            const { setFocusedId, items } = menuContextRef.current;
+        onLeaveLevel: (e) => {
+            const { setFocusedId, onLeaveLevel, focusedItem, items } = menuContextRef.current;
+            if (onLeaveLevel?.(focusedItem, e)) {
+                return;
+            }
             setFocusedId((prevId) => {
                 if (prevId === undefined) {
                     return prevId;

package/esm/@ui/UiMenu/types.d.ts

@@ -156,6 +156,8 @@ export interface IUiMenuContext<T extends IUiMenuItemData = object, M = object>
     pushShownSubview: (subview: IUiMenuSubview) => void;
     popShownSubview: () => void;
     onSelect: (item: IUiMenuFocusableItem<T> | undefined, event: MouseEvent | KeyboardEvent) => void;
+    onEnterLevel?: (item: IUiMenuFocusableItem<T> | undefined, event: MouseEvent | KeyboardEvent) => boolean;
+    onLeaveLevel?: (item: IUiMenuFocusableItem<T> | undefined, event: MouseEvent | KeyboardEvent) => boolean;
     onClose?: () => void;
     setFocusedId: Dispatch<SetStateAction<string | undefined>>;
     isItemFocusable: (item: IUiMenuItem<T>) => boolean;
@@ -187,6 +189,8 @@ export interface IUiMenuProps<T extends IUiMenuItemData = object, M = object> ex
     containerBottomPadding?: "none" | "small" | "medium";
     containerTopPadding?: "none" | "small" | "medium";
     onSelect?: (item: IUiMenuInteractiveItem<T>, event: MouseEvent | KeyboardEvent) => void;
+    onEnterLevel?: (item: IUiMenuFocusableItem<T> | undefined, event: MouseEvent | KeyboardEvent) => boolean;
+    onLeaveLevel?: (item: IUiMenuFocusableItem<T> | undefined, event: MouseEvent | KeyboardEvent) => boolean;
     onLevelChange?: (level: number, item?: IUiMenuContentItem<T> | IUiMenuInteractiveItem<T>) => void;
     onClose?: () => void;
     onUnhandledKeyDown?: (event: KeyboardEvent, context: IUiMenuContext<T>) => void;

package/esm/Header/generateHeaderMenuItemsGroups.js

@@ -71,7 +71,7 @@ function createInsightsItemsGroup(featureFlags, workspaceId, workspacePermission
     pushConditionally(insightItemsGroup, createIHeaderMenuItem(HEADER_ITEM_ID_METRICS, "s-menu-metrics", measuresUrl), canShowMetricsItem(hasMeasures, workspacePermissions));
     const dataUrl = dataItemUrl(workspaceId, workspacePermissions, backendSupportsDataItem, hasNoDataSet, baseUrl);
     pushConditionally(insightItemsGroup, createIHeaderMenuItem(HEADER_ITEM_ID_DATA, "s-menu-data", dataUrl), canShowDataItem(featureFlags, workspacePermissions));
-    pushConditionally(insightItemsGroup, createIHeaderMenuItem(HEADER_ITEM_ID_CATALOG, "s-menu-workspace-catalog", catalogItemUrl(workspaceId), true), canShowCatalogItem(featureFlags, workspacePermissions));
+    pushConditionally(insightItemsGroup, createIHeaderMenuItem(HEADER_ITEM_ID_CATALOG, "s-menu-workspace-catalog", catalogItemUrl(workspaceId, featureFlags), true), canShowCatalogItem(featureFlags, workspacePermissions));
     const loadUrl = loadItemUrl(baseUrl, workspaceId);
     pushConditionally(insightItemsGroup, createIHeaderMenuItem(HEADER_ITEM_ID_LOAD, "s-menu-load", loadUrl), canShowLoadItem(featureFlags, workspacePermissions, isFreemiumCustomer, backendSupportsCsvUploader));
     return insightItemsGroup;
@@ -90,7 +90,15 @@ function pushConditionally(items, item, cond) {
     }
 }
 const withBaseUrl = (baseUrl, uri) => `${baseUrl.endsWith("/") ? baseUrl.substring(0, baseUrl.length - 2) : baseUrl}${uri}`;
-function catalogItemUrl(workspaceId) {
+function catalogItemUrl(workspaceId, featureFlags) {
+    // When the host app and the catalog pluggable-app migration are both on,
+    // link directly to the singular host route. Otherwise fall back to the
+    // legacy plural URL owned by gdc-home-ui, which re-redirects to the host
+    // route on arrival. Skipping the indirection avoids a double redirect when
+    // switching from Dashboards/Analyze/Metrics/Data to Catalog. See LX-2426.
+    if (featureFlags.enableShellApplication && featureFlags.enableShellApplication_catalog) {
+        return `/workspace/${workspaceId}/catalog`;
+    }
     return `/workspaces/${workspaceId}/catalog`;
 }
 function canShowCatalogItem(featureFlags, workspacePermissions) {

package/esm/sdk-ui-kit.d.ts

@@ -7171,6 +7171,8 @@ export declare interface IUiMenuContext<T extends IUiMenuItemData = object, M =
     pushShownSubview: (subview: IUiMenuSubview) => void;
     popShownSubview: () => void;
     onSelect: (item: IUiMenuFocusableItem<T> | undefined, event: MouseEvent_2 | KeyboardEvent_2) => void;
+    onEnterLevel?: (item: IUiMenuFocusableItem<T> | undefined, event: MouseEvent_2 | KeyboardEvent_2) => boolean;
+    onLeaveLevel?: (item: IUiMenuFocusableItem<T> | undefined, event: MouseEvent_2 | KeyboardEvent_2) => boolean;
     onClose?: () => void;
     setFocusedId: Dispatch<SetStateAction<string | undefined>>;
     isItemFocusable: (item: IUiMenuItem<T>) => boolean;
@@ -7298,6 +7300,8 @@ export declare interface IUiMenuProps<T extends IUiMenuItemData = object, M = ob
     containerBottomPadding?: "none" | "small" | "medium";
     containerTopPadding?: "none" | "small" | "medium";
     onSelect?: (item: IUiMenuInteractiveItem<T>, event: MouseEvent_2 | KeyboardEvent_2) => void;
+    onEnterLevel?: (item: IUiMenuFocusableItem<T> | undefined, event: MouseEvent_2 | KeyboardEvent_2) => boolean;
+    onLeaveLevel?: (item: IUiMenuFocusableItem<T> | undefined, event: MouseEvent_2 | KeyboardEvent_2) => boolean;
     onLevelChange?: (level: number, item?: IUiMenuContentItem<T> | IUiMenuInteractiveItem<T>) => void;
     onClose?: () => void;
     onUnhandledKeyDown?: (event: KeyboardEvent_2, context: IUiMenuContext<T>) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddata/sdk-ui-kit",
-  "version": "11.36.0-alpha.6",
+  "version": "11.36.0",
   "description": "GoodData SDK - UI Building Components",
   "license": "MIT",
   "author": "GoodData Corporation",
@@ -75,11 +75,11 @@
     "tslib": "2.8.1",
     "unified": "^11.0.5",
     "uuid": "11.1.0",
-    "@gooddata/sdk-backend-spi": "11.36.0-alpha.6",
-    "@gooddata/sdk-ui": "11.36.0-alpha.6",
-    "@gooddata/util": "11.36.0-alpha.6",
-    "@gooddata/sdk-model": "11.36.0-alpha.6",
-    "@gooddata/sdk-ui-theme-provider": "11.36.0-alpha.6"
+    "@gooddata/sdk-backend-spi": "11.36.0",
+    "@gooddata/sdk-model": "11.36.0",
+    "@gooddata/sdk-ui": "11.36.0",
+    "@gooddata/util": "11.36.0",
+    "@gooddata/sdk-ui-theme-provider": "11.36.0"
   },
   "devDependencies": {
     "@microsoft/api-documenter": "^7.17.0",
@@ -128,11 +128,11 @@
     "typescript": "5.9.3",
     "vitest": "4.1.0",
     "vitest-dom": "0.1.1",
-    "@gooddata/eslint-config": "11.36.0-alpha.6",
-    "@gooddata/oxlint-config": "11.36.0-alpha.6",
-    "@gooddata/reference-workspace": "11.36.0-alpha.6",
-    "@gooddata/sdk-backend-mockingbird": "11.36.0-alpha.6",
-    "@gooddata/stylelint-config": "11.36.0-alpha.6"
+    "@gooddata/eslint-config": "11.36.0",
+    "@gooddata/oxlint-config": "11.36.0",
+    "@gooddata/sdk-backend-mockingbird": "11.36.0",
+    "@gooddata/stylelint-config": "11.36.0",
+    "@gooddata/reference-workspace": "11.36.0"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",