superdesk-ui-framework 3.0.1-beta.12 → 3.0.1-beta.14

package/app/styles/_table-list.scss

@@ -5,6 +5,7 @@
     display: flex;
     flex-direction: column;
     align-self: stretch;
+    overflow: hidden !important;
     //gap: $sd-base-increment * 1.5;
     &--comfortable {
         gap: $sd-base-increment * 2;

package/app/styles/dropdowns/_basic-dropdown.scss

@@ -109,6 +109,10 @@ $focus-box-shadow:              0 0 0 3px $sd-colour--focus-shadow;
     border-radius: $dropdownMenuBorderRadius;
     text-align: start;
 
+    .dropdown {
+        width: 100%;
+    }
+
     // Links within the dropdown menu
     li, .dropdown__menu-item {
         a:not(.btn), button:not(.btn):not(.dropdown__menu-close):not(.toggle-button) {
@@ -193,8 +197,10 @@ $focus-box-shadow:              0 0 0 3px $sd-colour--focus-shadow;
         }
         .dropdown__menu-body {
             overflow-y: auto;
+            overflow-x: hidden;
             flex: 0 1;
             padding: 0.6rem 0;
+            max-height: 320px;
         }
         .dropdown__menu-body:first-child {
             .dropdown__menu-label {

package/app-typescript/components/Dropdown.tsx

@@ -4,7 +4,7 @@ import { createPopper } from '@popperjs/core';
 import { useId } from "react-id-generator";
 
 export interface IMenuItem {
-    label: string;
+    label: string | React.ReactNode;
     icon?: string;
     active?: boolean;
     onSelect(): void;
@@ -16,19 +16,19 @@ interface IMenuItemRes extends IMenuItem {
 
 export interface ISubmenu {
     type: 'submenu';
-    label: string;
+    label: string | React.ReactNode;
     icon?: string;
     items: Array<IMenuItem | ISubmenu | IMenuGroup | 'divider'>;
 }
 
 export interface IMenuGroup {
     type: 'group';
-    label?: string;
+    label?: string | React.ReactNode;
     items: Array<IMenuItem | ISubmenu | IMenuGroup | 'divider'>;
 }
 
 interface IMenu {
-    label?: string;
+    label?: string | React.ReactNode;
     align?: 'left' | 'right';
     items: Array<IMenuItem | ISubmenu | IMenuGroup | 'divider'>;
     header?: Array<IMenuItem | ISubmenu | IMenuGroup | 'divider'>;
@@ -38,6 +38,8 @@ interface IMenu {
     onChange?(event?: any): void;
 }
 
+const DROPDOWN_ID_CONTAINER = "sd-dropdown-constainer";
+
 export const Dropdown = ({
     items,
     header,
@@ -50,11 +52,8 @@ export const Dropdown = ({
     const [open, setOpen] = React.useState(false);
     const [change, setChange] = React.useState(false);
     const [menuID] = useId();
-    const DROPDOWN_ID = "react-placeholder";
     const ref = React.useRef(null);
-    const refSubMenu = React.useRef(null);
     const buttonRef = React.useRef(null);
-    const refButtonSubMenu = React.useRef(null);
     const headerElements = header?.map((el, index) => {
         return each(el, index);
     });
@@ -66,12 +65,12 @@ export const Dropdown = ({
     const footerElements = footer?.map((el, index) => {
         return each(el, index);
     });
+
     React.useEffect(() => {
-        const existingElement = document.getElementById(DROPDOWN_ID);
+        const existingElement = document.getElementById(DROPDOWN_ID_CONTAINER);
         if (!existingElement) {
             const el = document.createElement("div");
-            el.id = DROPDOWN_ID;
-            // style placeholder
+            el.id = DROPDOWN_ID_CONTAINER;
             el.style.position = 'absolute';
             el.style.top = '0';
             el.style.left = '0';
@@ -80,7 +79,6 @@ export const Dropdown = ({
 
             document.body.appendChild(el);
         }
-
     }, [change]);
 
     React.useLayoutEffect(() => {
@@ -88,17 +86,12 @@ export const Dropdown = ({
             addInPlaceholder();
         }
         setChange(true);
-
     }, [open]);
 
-    // structure for append menu
     function createAppendMenu() {
         if (header && footer) {
             return (
-                <div className='dropdown__menu dropdown__menu--has-head-foot'
-                    id={menuID}
-                    role='menu'
-                    ref={ref}>
+                <div className='dropdown__menu dropdown__menu--has-head-foot' id={menuID} role='menu' ref={ref}>
                     <ul className='dropdown__menu-header'>
                         {headerElements}
                     </ul>
@@ -112,10 +105,7 @@ export const Dropdown = ({
             );
         } else if (header) {
             return (
-                <div className='dropdown__menu dropdown__menu--has-head-foot'
-                    id={menuID}
-                    role='menu'
-                    ref={ref}>
+                <div className='dropdown__menu dropdown__menu--has-head-foot' id={menuID} role='menu' ref={ref}>
                     <ul className='dropdown__menu-header'>
                         {headerElements}
                     </ul>
@@ -126,10 +116,7 @@ export const Dropdown = ({
             );
         } else if (footer) {
             return (
-                <div className='dropdown__menu dropdown__menu--has-head-foot'
-                    id={menuID}
-                    role='menu'
-                    ref={ref}>
+                <div className='dropdown__menu dropdown__menu--has-head-foot' id={menuID} role='menu' ref={ref}>
                     <ul className='dropdown__menu-body'>
                         {dropdownElements}
                     </ul>
@@ -140,17 +127,13 @@ export const Dropdown = ({
             );
         } else {
             return (
-                <ul className='dropdown__menu '
-                    id={menuID}
-                    role='menu'
-                    ref={ref}>
+                <ul className='dropdown__menu ' id={menuID} role='menu' ref={ref}>
                     {dropdownElements}
                 </ul>
             );
         }
     }
 
-    // toggle menu
     function toggleDisplay() {
         if (!open) {
             let menuRef: any;
@@ -199,14 +182,13 @@ export const Dropdown = ({
     }
 
     function addInPlaceholder() {
-        const placeholder = document.getElementById(DROPDOWN_ID);
+        const placeholder = document.getElementById(DROPDOWN_ID_CONTAINER);
         let menu = createAppendMenu();
         if (open) {
             return ReactDOM.render(menu, placeholder);
         } else {
-            const menuDOM = document.getElementById(menuID);
-            if (menuDOM) {
-                menuDOM.style.display = 'none';
+            if (placeholder) {
+                ReactDOM.unmountComponentAtNode(placeholder);
             }
         }
     }
@@ -218,33 +200,13 @@ export const Dropdown = ({
                 submenuItems.push(each(el, key));
             });
             return (
-                <li key={index}>
-                    <div className='dropdown' >
-                        <button
-                            ref={refButtonSubMenu}
-                            className='dropdown__toggle dropdown-toggle'
-                            aria-haspopup="menu"
-                            tabIndex={0}
-                            onMouseOver={() => {
-                                let subMenuRef = refSubMenu.current;
-                                let subToggleRef = refButtonSubMenu.current;
-                                if (subMenuRef && subToggleRef) {
-                                    createPopper(subToggleRef, subMenuRef, {
-                                        placement: 'right-start',
-                                    });
-                                }
-                            }}
-                            onClick={item['onSelect']}>
-                            {item['icon'] ? <i className={'icon-' + item['icon']}></i> : null}
-                            {item['label']}
-                        </button>
-                        <ul ref={refSubMenu}
-                            role='menu'
-                            className='dropdown__menu'>
-                            {submenuItems}
-                        </ul>
-                    </div>
-                </li>
+                <DropdownItemWithSubmenu
+                key={index}
+                index={index}
+                item={item}
+                menuID={menuID}
+                subMenuItems={submenuItems}
+                onChange={onChange} />
             );
         } else if (item['type'] === 'group') {
             let groupItems: any = [];
@@ -264,17 +226,18 @@ export const Dropdown = ({
         } else {
             return (
                 <DropdownItem
-                    key={index}
-                    label={item['label']}
-                    icon={item['icon']}
-                    active={item['active']}
-                    onSelect={item['onSelect']}
-                    onChange={onChange} />);
+                key={index}
+                label={item['label']}
+                icon={item['icon']}
+                active={item['active']}
+                onSelect={item['onSelect']}
+                onChange={onChange} />
+            );
         }
     }
 
     return (
-        <div className={'dropdown ' + (open ? 'open' : '')} >
+        <div className={'dropdown ' + (open ? 'open' : '')}>
             {typeof children === 'object' ?
                 (React.isValidElement(children) ?
                     <div ref={buttonRef} style={{ display: 'content' }}>
@@ -288,11 +251,11 @@ export const Dropdown = ({
                     </div> : null)
                 :
                 <button ref={buttonRef}
-                    className=' dropdown__toggle dropdown-toggle'
-                    aria-haspopup="menu"
-                    tabIndex={0}
-                    aria-expanded={open}
-                    onClick={toggleDisplay}>
+                className=' dropdown__toggle dropdown-toggle'
+                aria-haspopup="menu"
+                tabIndex={0}
+                aria-expanded={open}
+                onClick={toggleDisplay}>
                     {children}
                     <span className="dropdown__caret"></span>
                 </button>}
@@ -301,7 +264,7 @@ export const Dropdown = ({
                 null : (function() {
                     if (header && footer) {
                         return (
-                            <div className='dropdown__menu dropdown__menu--has-head-foot' role='menu' ref={ref} >
+                            <div className='dropdown__menu dropdown__menu--has-head-foot' role='menu' ref={ref}>
                                 <ul className='dropdown__menu-header'>
                                     {headerElements}
                                 </ul>
@@ -315,7 +278,7 @@ export const Dropdown = ({
                         );
                     } else if (header) {
                         return (
-                            <div className='dropdown__menu dropdown__menu--has-head-foot' role='menu' ref={ref} >
+                            <div className='dropdown__menu dropdown__menu--has-head-foot' role='menu' ref={ref}>
                                 <ul className='dropdown__menu-header'>
                                     {headerElements}
                                 </ul>
@@ -326,7 +289,7 @@ export const Dropdown = ({
                         );
                     } else if (footer) {
                         return (
-                            <div className='dropdown__menu dropdown__menu--has-head-foot' role='menu' ref={ref} >
+                            <div className='dropdown__menu dropdown__menu--has-head-foot' role='menu' ref={ref}>
                                 <ul className='dropdown__menu-body'>
                                     {dropdownElements}
                                 </ul>
@@ -337,7 +300,7 @@ export const Dropdown = ({
                         );
                     } else {
                         return (
-                            <ul className='dropdown__menu' role='menu' ref={ref} >
+                            <ul className='dropdown__menu' role='menu' ref={ref}>
                                 {dropdownElements}
                             </ul>
                         );
@@ -356,7 +319,9 @@ onChange,
 }: IMenuItemRes) => {
     return (
         <li role='none' className={active ? 'dropdown__menu-item--active' : ''}>
-            <button tabIndex={0} role='menuitem' onClick={() => {
+            <button tabIndex={0}
+            role='menuitem'
+            onClick={() => {
                 onSelect();
                 if (onChange) {
                     onChange();
@@ -367,5 +332,68 @@ onChange,
             </button>
         </li>
     );
+};
+
+const DropdownItemWithSubmenu = ({
+    index,
+    item,
+    menuID,
+    subMenuItems,
+    onChange,
+}: IMenuItem | any) => {
+    const [open, setOpen] = React.useState<undefined | boolean>(undefined);
 
+    const refButtonSubMenu = React.useRef(null);
+    const refSubMenu = React.useRef(null);
+    const placeholder = document.getElementById(menuID);
+
+    React.useEffect(() => {
+        let subMenuRef: any = refSubMenu.current;
+        let subToggleRef = refButtonSubMenu.current;
+
+        if (open === true) {
+            placeholder?.appendChild(subMenuRef);
+            subMenuRef.style.display = 'block';
+        } else if (open === false) {
+            placeholder?.removeChild(subMenuRef);
+            subMenuRef.style.display = 'none';
+        }
+
+        if (subMenuRef && subToggleRef) {
+            createPopper(subToggleRef, subMenuRef, {
+                placement: 'right-start',
+            });
+        }
+    }, [open]);
+
+    return (
+        <li key={index} ref={refButtonSubMenu}>
+            <div className='dropdown'
+            onMouseLeave={() => setOpen(false)}>
+                <button
+                className='dropdown__toggle dropdown-toggle'
+                aria-haspopup="menu"
+                tabIndex={0}
+                onClick={() => {
+                    if (item.onSelect) {
+                        item.onSelect();
+                    }
+                    if (onChange) {
+                        onChange();
+                    }
+                }}
+                onMouseOver={() => setOpen(true) }>
+                    {item['icon'] ? <i className={'icon-' + item['icon']}></i> : null}
+                    {item['label']}
+                </button>
+                <ul
+                role='menu'
+                ref={refSubMenu}
+                style={{display: 'none'}}
+                className='dropdown__menu'>
+                    {subMenuItems}
+                </ul>
+            </div>
+        </li>
+    );
 };

package/app-typescript/components/DurationInput.tsx

@@ -356,7 +356,7 @@ export class DurationInput extends React.PureComponent<IProps, IState> {
     }
 }
 
-export function getDurationString(seconds: number) {
+export function getDurationString(seconds: number, zero?: boolean) {
     function zeroPad(value: number | string) {
         if (value.toString().length === 1 || value === 0) {
             return `0${value}`;
@@ -367,9 +367,19 @@ export function getDurationString(seconds: number) {
         }
     }
 
-    let hour = zeroPad(Math.floor(seconds / 3600));
-    let minute = zeroPad(Math.floor((seconds % 3600) / 60));
-    let second = zeroPad(Math.floor(seconds % 60));
+    let hour;
+    let minute;
+    let second;
+
+    if (zero) {
+        hour = zeroPad(Math.floor(seconds / 3600));
+        minute = zeroPad(Math.floor((seconds % 3600) / 60));
+        second = zeroPad(Math.floor(seconds % 60));
+    } else {
+        hour = Math.floor(seconds / 3600);
+        minute = Math.floor((seconds % 3600) / 60);
+        second = Math.floor(seconds % 60);
+    }
 
     if (Number(hour) === 0 && Number(minute) > 0) {
         return `${minute}m ${second}s`;

package/app-typescript/components/Lists/ContentList.tsx

@@ -14,8 +14,34 @@ interface IPropsItem {
 }
 
 class ContentListItem extends React.PureComponent<IPropsItem> {
+
+    private timer: any;
+    private delay = 200;
+    private prevent = false;
+
+    onSingleClick = () => {
+        this.timer = setTimeout(() => {
+            if (!this.prevent) {
+                if (this.props.onClick) {
+                    this.props.onClick();
+                }
+            }
+        }, this.delay);
+    }
+
+    onDoubleClick = () => {
+        clearTimeout(this.timer);
+        this.prevent = true;
+        if (this.props.onDoubleClick) {
+            this.props.onDoubleClick();
+        }
+        setTimeout(() => {
+            this.prevent = false;
+        }, this.delay);
+    }
+
     render() {
-        let classes = classNames('sd-list-item sd-list-item-group sd-list-item-group--space-between-items', {
+        let classes = classNames('sd-list-item sd-shadow--z1', {
             'sd-list-item--activated': this.props.activated,
             'sd-list-item--selected': this.props.selected,
             'fetched': this.props.archived,
@@ -23,8 +49,7 @@ class ContentListItem extends React.PureComponent<IPropsItem> {
     });
 
         return (
-            <div className={classes} onClick={this.props.onClick} onDoubleClick={this.props.onDoubleClick}>
-                <div className="sd-list-item sd-shadow--z1">
+                <div className={classes} onClick={this.onSingleClick} onDoubleClick={this.onDoubleClick}>
                     {this.props.locked
                     ? <div className="sd-list-item__border sd-list-item__border--locked"></div>
                     : <div className="sd-list-item__border"></div>}
@@ -47,7 +72,6 @@ class ContentListItem extends React.PureComponent<IPropsItem> {
                         {this.props.action}
                     </div>
                 </div>
-            </div>
         );
     }
 }

package/app-typescript/components/Lists/TableList.tsx

@@ -9,12 +9,12 @@ export interface IProps {
     array: Array<IPropsArrayItem>;
     addItem?: boolean;
     dragAndDrop?: boolean;
-    itemsDropdown?: Array<IMenuItem | ISubmenu | IMenuGroup | 'divider'>;
     className?: string;
     readOnly?: boolean;
     showDragHandle?: 'always' | 'onHover' | 'none'; // always default
     onDrag?(start: number, end: number): void;
     onAddItem?(index: number, item?: IPropsArrayItem ): void;
+    itemsDropdown?(index?: number): Array<IMenuItem | ISubmenu | IMenuGroup | 'divider'>;
 }
 
 export interface IPropsArrayItem {
@@ -22,9 +22,9 @@ export interface IPropsArrayItem {
     center?: React.ReactNode;
     end?: React.ReactNode;
     action?: React.ReactNode;
+    hexColor?: string;
     onClick?(): void;
     onDoubleClick?(): void;
-    hexColor?: string;
 }
 
 interface IState {
@@ -86,7 +86,7 @@ class TableList extends React.PureComponent<IProps, IState> {
     dropDown() {
         return (
             <Dropdown
-                items={this.props.itemsDropdown ? this.props.itemsDropdown : []}>
+                items={this.props.itemsDropdown ? this.props.itemsDropdown() : []}>
                 <Button
                     type="primary"
                     icon="plus-large"
@@ -135,7 +135,9 @@ class TableList extends React.PureComponent<IProps, IState> {
                                                             ? item.onDoubleClick
                                                             : undefined}
                                                         addItem={this.props.addItem}
-                                                        itemsDropdown={this.props.itemsDropdown}
+                                                        itemsDropdown={() => this.props.itemsDropdown
+                                                            ? this.props.itemsDropdown(index)
+                                                            : []}
                                                         hexColor={item.hexColor}
                                                         onAddItem={() => this.props.onAddItem
                                                             && this.props.onAddItem(index, item)}
@@ -172,7 +174,7 @@ class TableList extends React.PureComponent<IProps, IState> {
                                     ? item.onDoubleClick
                                     : undefined}
                                 addItem={this.props.addItem}
-                                itemsDropdown={this.props.itemsDropdown}
+                                itemsDropdown={() => this.props.itemsDropdown ? this.props.itemsDropdown(index) : []}
                                 hexColor={item.hexColor}
                                 onAddItem={() => this.props.onAddItem
                                     && this.props.onAddItem(index, item)}
@@ -208,14 +210,14 @@ export interface IPropsItem {
     end?: React.ReactNode;
     action?: React.ReactNode;
     addItem?: boolean;
-    itemsDropdown?: any;
     dragAndDrop?: boolean;
+    hexColor?: string;
+    showDragHandle?: 'always' | 'onHover' | 'none';
     onClick?(): void;
     onDoubleClick?(): void;
     onSelect?(): void;
     onAddItem?(e: number): void;
-    hexColor?: string;
-    showDragHandle?: 'always' | 'onHover' | 'none';
+    itemsDropdown?(index?: number): Array<IMenuItem | ISubmenu | IMenuGroup | 'divider'>;
 }
 
 class TableListItem extends React.PureComponent<IPropsItem> {
@@ -281,7 +283,7 @@ class TableListItem extends React.PureComponent<IPropsItem> {
                             <div className='table-list__add-bar'>
                                 <Dropdown
                                     onChange={this.props.onAddItem}
-                                    items={this.props.itemsDropdown ? this.props.itemsDropdown : []}>
+                                    items={this.props.itemsDropdown ? this.props.itemsDropdown() : []}>
                                     <Button
                                         type="primary"
                                         icon="plus-large"