[arvados] updated: 2.7.0-5797-g5382a72a72
git repository hosting
git at public.arvados.org
Thu Jan 11 14:51:28 UTC 2024
Summary of changes:
.../multiselect-toolbar/ms-toolbar-overflow-menu.tsx | 20 +++++++++++++++-----
.../ms-toolbar-overflow-wrapper.tsx | 10 +++++++---
2 files changed, 22 insertions(+), 8 deletions(-)
via 5382a72a72279b40641fdf98bee2eb2b16108bbe (commit)
from c27bb5c264c5f8760baee1956dcfc6a2657e0917 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 5382a72a72279b40641fdf98bee2eb2b16108bbe
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Thu Jan 11 09:51:23 2024 -0500
21317: added menu types Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-menu.tsx b/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-menu.tsx
index 09333075d6..207b341b1b 100644
--- a/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-menu.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-menu.tsx
@@ -2,13 +2,13 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import React, { useState, useMemo } from 'react';
+import React, { useState, useMemo, ReactElement, JSXElementConstructor } from 'react';
import { DoubleRightArrows } from 'components/icon/icon';
import classnames from 'classnames';
import { IconButton, Menu, MenuItem, StyleRulesCallback, Tooltip, WithStyles, withStyles } from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
-type CssRules = 'inOverflowMenu' | 'iconButton';
+type CssRules = 'inOverflowMenu' | 'openMenuButton' | 'menu';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
inOverflowMenu: {
@@ -16,12 +16,22 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
backgroundColor: 'transparent',
},
},
- iconButton: {
+ openMenuButton: {
right: '10px',
},
+ menu: {
+ }
});
-export const OverflowMenu = withStyles(styles)((props: any & WithStyles<CssRules>) => {
+export type OverflowChild = ReactElement<{ className: string; }, string | JSXElementConstructor<any>>
+
+type OverflowMenuProps = {
+ children: OverflowChild[]
+ className: string
+ visibilityMap: {}
+}
+
+export const OverflowMenu = withStyles(styles)((props: OverflowMenuProps & WithStyles<CssRules>) => {
const { children, className, visibilityMap, classes } = props;
const [anchorEl, setAnchorEl] = useState(null);
const open = Boolean(anchorEl);
@@ -45,7 +55,7 @@ export const OverflowMenu = withStyles(styles)((props: any & WithStyles<CssRules
aria-controls='long-menu'
aria-haspopup='true'
onClick={handleClick}
- className={classes.iconButton}
+ className={classes.openMenuButton}
>
<DoubleRightArrows />
</IconButton>
diff --git a/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx b/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx
index e63225b05f..94a34c72e5 100644
--- a/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx
@@ -2,11 +2,11 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState, useRef, useEffect , ReactElement, JSXElementConstructor} from 'react';
import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
import classnames from 'classnames'
import { ArvadosTheme } from 'common/custom-theme';
-import { OverflowMenu } from './ms-toolbar-overflow-menu';
+import { OverflowMenu, OverflowChild} from './ms-toolbar-overflow-menu';
type CssRules = 'visible' | 'inVisible' | 'toolbarWrapper' | 'overflowStyle';
@@ -35,7 +35,11 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
},
});
-export const IntersectionObserverWrapper = withStyles(styles)((props: any & WithStyles<CssRules>) => {
+type WrapperProps = {
+ children: OverflowChild[]
+}
+
+export const IntersectionObserverWrapper = withStyles(styles)((props: WrapperProps & WithStyles<CssRules>) => {
const { classes, children} = props
const navRef = useRef<any>(null);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list