From ce3c0f2892ef1099b00af96610a794c9b627958f Mon Sep 17 00:00:00 2001 From: Brian Ingles Date: Wed, 1 May 2024 16:42:03 -0500 Subject: [PATCH] Mapped ActionMenu and ListActionMenu (#445) --- plugins/ui/src/js/src/elements/SpectrumElementUtils.ts | 4 ++++ plugins/ui/src/js/src/widget/WidgetUtils.tsx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/plugins/ui/src/js/src/elements/SpectrumElementUtils.ts b/plugins/ui/src/js/src/elements/SpectrumElementUtils.ts index 312a6b5ab..d070f9d04 100644 --- a/plugins/ui/src/js/src/elements/SpectrumElementUtils.ts +++ b/plugins/ui/src/js/src/elements/SpectrumElementUtils.ts @@ -2,6 +2,7 @@ import { ButtonGroup, Checkbox } from '@adobe/react-spectrum'; import { ValueOf } from '@deephaven/utils'; import { ActionGroup, + ActionMenu, Content, ContextualHelp, Grid, @@ -10,6 +11,7 @@ import { Item, IllustratedMessage, ListActionGroup, + ListActionMenu, NumberField, Switch, Tabs, @@ -35,6 +37,7 @@ export const SPECTRUM_ELEMENT_TYPE_PREFIX = 'deephaven.ui.spectrum.'; export const SpectrumSupportedTypes = { ActionButton, ActionGroup, + ActionMenu, Button, ButtonGroup, Checkbox, @@ -47,6 +50,7 @@ export const SpectrumSupportedTypes = { Icon, IllustratedMessage, ListActionGroup, + ListActionMenu, NumberField, Item, RangeSlider, diff --git a/plugins/ui/src/js/src/widget/WidgetUtils.tsx b/plugins/ui/src/js/src/widget/WidgetUtils.tsx index e8c520518..5ebfd2219 100644 --- a/plugins/ui/src/js/src/widget/WidgetUtils.tsx +++ b/plugins/ui/src/js/src/widget/WidgetUtils.tsx @@ -5,8 +5,10 @@ import React, { ComponentType } from 'react'; // wrapped due to how Spectrum collection components consume them. import { ActionGroup, + ActionMenu, Item, ListActionGroup, + ListActionMenu, Section, } from '@deephaven/components'; import { ValueOf } from '@deephaven/utils'; @@ -49,9 +51,11 @@ export const elementComponentMap = { // Other components [ELEMENT_NAME.actionGroup]: ActionGroup, + [ELEMENT_NAME.actionMenu]: ActionMenu, [ELEMENT_NAME.fragment]: React.Fragment, [ELEMENT_NAME.item]: Item, [ELEMENT_NAME.listActionGroup]: ListActionGroup, + [ELEMENT_NAME.listActionMenu]: ListActionMenu, [ELEMENT_NAME.listView]: ListView, [ELEMENT_NAME.picker]: Picker, [ELEMENT_NAME.section]: Section,