superdesk-ui-framework 3.0.1-beta.3 → 3.0.1-beta.30

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

@@ -1,133 +1,76 @@
 import * as React from 'react';
 import classNames from 'classnames';
-import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
+import { DragDropContext, Droppable, Draggable, DropResult } from "react-beautiful-dnd";
 import { Tooltip } from '../Tooltip';
 import { Button } from '../Button';
-import { Dropdown } from '../Dropdown';
+import { Dropdown, IMenuItem, ISubmenu, IMenuGroup } from '../Dropdown';
+import ReactDOM from 'react-dom';
 
-interface IPropsItem {
-    start?: React.ReactNode;
-    center?: React.ReactNode;
-    end?: React.ReactNode;
-    action?: React.ReactNode;
+export interface IProps {
+    array: Array<IPropsArrayItem>;
     addItem?: boolean;
-    itemsDropdown?: any;
     dragAndDrop?: boolean;
-    onClick?(): void;
-}
-
-class TableListItem extends React.PureComponent<IPropsItem> {
-    render() {
-        return (
-            this.props.addItem ?
-            <li className='table-list__item-container'>
-                <div
-                onClick={this.props.onClick}
-                className={`table-list__item ${this.props.onClick && 'table-list__item--clickable'} ${this.props.dragAndDrop && 'table-list__item--draggable'}`}>
-                    <div className='table-list__item-content'>
-                        <div className='table-list__item-content-block'>
-                            {this.props.start && this.props.start}
-                        </div>
-                        <div className='table-list__item-content-block table-list__item-content-block--center'>
-                            {this.props.center && this.props.center}
-                        </div>
-                        <div className='table-list__item-content-block'>
-                            {this.props.end && this.props.end}
-                        </div>
-                    </div>
-                    {this.props.action && <div className='table-list__slide-in-actions'>
-                        {this.props.action}
-                    </div>}
-                </div>
-                <div className='table-list__add-bar-container'>
-                    <Tooltip text='Add item' flow='top' appendToBody={true}>
-                        <div className='table-list__add-bar'>
-                            <Dropdown
-                                items={this.props.itemsDropdown}>
-                                    <Button
-                                    type="primary"
-                                    icon="plus-large"
-                                    text="Add item"
-                                    size="small"
-                                    shape="round"
-                                    iconOnly={true}
-                                    onClick={() => false}
-                                    />
-                            </Dropdown>
-                        </div>
-                    </Tooltip>
-                </div>
-            </li>
-            : <li
-            className={`table-list__item ${this.props.onClick && 'table-list__item--clickable'} ${this.props.dragAndDrop && 'table-list__item--draggable'} table-list__item--margin`}
-            onClick={this.props.onClick}>
-                <div className='table-list__item-content'>
-                    <div className='table-list__item-content-block'>
-                        {this.props.start && this.props.start}
-                    </div>
-                    <div className='table-list__item-content-block table-list__item-content-block--center'>
-                        {this.props.center && this.props.center}
-                    </div>
-                    <div className='table-list__item-content-block'>
-                        {this.props.end && this.props.end}
-                    </div>
-                </div>
-                {this.props.action && <div className='table-list__slide-in-actions'>
-                    {this.props.action}
-                </div>}
-            </li>
-        );
-    }
-}
-
-interface IProps {
-    children?: React.ReactNode;
-    array?: Array<IPropsArray>;
-    addItem?: boolean;
-    dragAndDrop?: boolean;
-    itemsDropdown?: any;
     className?: string;
-    onClick?(): void;
+    readOnly?: boolean;
+    showDragHandle?: 'always' | 'onHover' | 'none'; // always default
+    append?: boolean;
+    onDrag?(start: number, end: number): void;
+    onAddItem?(index: number, item?: IPropsArrayItem): void;
+    itemsDropdown?(index?: number): Array<IMenuItem | ISubmenu | IMenuGroup | 'divider'>;
 }
 
-interface IPropsArray {
+export interface IPropsArrayItem {
     start?: React.ReactNode;
     center?: React.ReactNode;
     end?: React.ReactNode;
     action?: React.ReactNode;
+    hexColor?: string;
+    onClick?(): void;
+    onDoubleClick?(): void;
+    locked?: boolean;
+    positionLocked?: boolean;
 }
 
-const reorder = (list, startIndex, endIndex) => {
-  const result = Array.from(list);
-  const [removed] = result.splice(startIndex, 1);
-  result.splice(endIndex, 0, removed);
+interface IState {
+    items: Array<IPropsArrayItem>;
+}
 
-  return result;
+const reorder = (list: Array<IPropsArrayItem>, startIndex: number, endIndex: number) => {
+    const result = Array.from(list);
+    const [removed] = result.splice(startIndex, 1);
+    result.splice(endIndex, 0, removed);
+
+    return result;
 };
 
-class TableList extends React.PureComponent<IProps, {items: any}> {
-    constructor(props) {
+class TableList extends React.PureComponent<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
         this.state = {
-          items: [],
+            items: [],
         };
 
         this.onDragEnd = this.onDragEnd.bind(this);
+        this.dropDown = this.dropDown.bind(this);
     }
 
     componentDidMount(): void {
-        this.setState({items: this.props.array});
+        if (this.props.array) {
+            this.setState({ items: this.props.array });
+        }
     }
 
-    componentDidUpdate(prevProps: Readonly<IProps>, prevState: Readonly<{ items: any; }>, snapshot?: any): void {
-        if (prevProps.array !== this.props.array) {
-            this.setState({
-                items: this.props.array,
-            });
+    componentDidUpdate(prevProps: IProps): void {
+        if (this.props.array) {
+            if (prevProps.array !== this.props.array) {
+                this.setState({
+                    items: this.props.array,
+                });
+            }
         }
     }
 
-    onDragEnd(result) {
+    onDragEnd(result: DropResult) {
         if (!result.destination) {
             return;
         }
@@ -137,72 +80,326 @@ class TableList extends React.PureComponent<IProps, {items: any}> {
             result.destination.index,
         );
         this.setState({
-            items,
+            items: items,
         });
+
+        return this.props.onDrag ?
+            this.props.onDrag(result.source.index, result.destination.index) : null;
+    }
+
+    dropDown() {
+        return (
+            <Dropdown
+                items={this.props.itemsDropdown ? this.props.itemsDropdown() : []}>
+                <Button
+                    type="primary"
+                    icon="plus-large"
+                    text="Add item"
+                    size="small"
+                    shape="round"
+                    iconOnly={true}
+                    onClick={() => false}
+                />
+            </Dropdown>
+        );
     }
 
     render() {
-        let classes = classNames({
-            'table-list' : !this.props.addItem,
+        let classes = classNames('', {
+            'table-list': !this.props.addItem,
+            'table-list--read-only': this.props.readOnly,
             [`${this.props.className}`]: this.props.className,
         });
 
         return (
-            this.props.array ?
-                this.props.dragAndDrop ?
-                <DragDropContext onDragEnd={this.onDragEnd}>
-                    <Droppable droppableId="droppable">
-                    {(provided, snapshot) => (
-                        <ul
-                        className={classes}
-                        ref={provided.innerRef}
-                        {...provided.droppableProps} >
-                            {this.state.items.map((item, index) => (
-                                <Draggable key={index} draggableId={`${index}`} index={index}>
-                                    {(provided2, snapshot2) => (
-                                        <div
-                                        ref={provided2.innerRef}
-                                        {...provided2.draggableProps}
-                                        {...provided2.dragHandleProps} >
-                                            <TableListItem
-                                            dragAndDrop={this.props.dragAndDrop}
-                                            start={item.start}
-                                            center={item.center}
-                                            end={item.end}
-                                            action={item.action}
-                                            onClick={item.onClick ? item.onClick : false}
-                                            addItem={this.props.addItem}
-                                            itemsDropdown={this.props.itemsDropdown} />
+            this.state.items.length > 0
+                ? this.props.dragAndDrop
+                    ? <DragDropContext onDragEnd={this.onDragEnd}>
+                        <Droppable droppableId="droppable">
+                            {(provided, _snapshot) => (
+                                <div
+                                    role='list'
+                                    className={classes}
+                                    ref={provided.innerRef}
+                                    {...provided.droppableProps} >
+                                    {this.state.items.map((item: IPropsArrayItem, index: number) => (
+                                        <Draggable key={index} draggableId={`${index}`} index={index}>
+                                            {(provided2, snapshot) => (
+                                                this.props.append
+                                                    ? <PortalItem
+                                                        provided={provided2}
+                                                        snapshot={snapshot}
+                                                        item={item}
+                                                        index={index}
+                                                        dragAndDrop={this.props.dragAndDrop}
+                                                        showDragHandle={this.props.showDragHandle}
+                                                        addItem={this.props.addItem}
+                                                        onAddItem={() => this.props.onAddItem
+                                                            && this.props.onAddItem(index, item)}
+                                                        itemsDropdown={() => this.props.itemsDropdown
+                                                            ? this.props.itemsDropdown(index)
+                                                            : []}
+                                                    />
+                                                    : <div
+                                                        ref={provided2.innerRef}
+                                                        {...provided2.draggableProps}
+                                                        {...provided2.dragHandleProps} >
+                                                        <TableListItem
+                                                            dragAndDrop={this.props.dragAndDrop}
+                                                            start={item.start}
+                                                            center={item.center}
+                                                            end={item.end}
+                                                            action={item.action}
+                                                            onClick={item.onClick ? item.onClick : undefined}
+                                                            onDoubleClick={item.onDoubleClick
+                                                                ? item.onDoubleClick
+                                                                : undefined}
+                                                            addItem={this.props.addItem}
+                                                            itemsDropdown={() => this.props.itemsDropdown
+                                                                ? this.props.itemsDropdown(index)
+                                                                : []}
+                                                            hexColor={item.hexColor}
+                                                            locked={item.locked}
+                                                            positionLocked={item.positionLocked}
+                                                            onAddItem={() => this.props.onAddItem
+                                                                && this.props.onAddItem(index, item)}
+                                                            showDragHandle={this.props.showDragHandle}
+                                                        />
+                                                    </div>
+                                            )}
+                                        </Draggable>
+                                    ))}
+                                    {provided.placeholder}
+                                    {(this.props.addItem && !this.props.readOnly) &&
+                                        <div className={`table-list__add-item table-list__item--margin`}>
+                                            <Tooltip text='Add item' flow='top' appendToBody={true}>
+                                                <div className='table-list__add-item--container sd-margin-x--auto'>
+                                                    {this.dropDown()}
+                                                </div>
+                                            </Tooltip>
                                         </div>
-                                    )}
-                                </Draggable>
-                            ))}
-                            {provided.placeholder}
-                        </ul>
-                    )}
-                    </Droppable>
-                </DragDropContext>
-                : <ul className={classes}>
-                    {this.state.items.map((item, index) => (
-                        <TableListItem
-                        key={index}
-                        start={item.start}
-                        center={item.center}
-                        end={item.end}
-                        action={item.action}
-                        onClick={item.onClick ? item.onClick : false}
-                        addItem={this.props.addItem}
-                        itemsDropdown={this.props.itemsDropdown} />
-                    ))}
-                </ul>
-            : this.props.children &&
-            <ul className={classes}>
-                {this.props.children}
-            </ul>
+                                    }
+                                </div>
+                            )}
+                        </Droppable>
+                    </DragDropContext>
+                    : <div role='list' className={classes}>
+                        {this.state.items.map((item: IPropsArrayItem, index: number) => (
+                            <TableListItem
+                                key={index}
+                                start={item.start}
+                                center={item.center}
+                                end={item.end}
+                                action={item.action}
+                                onClick={item.onClick ? item.onClick : undefined}
+                                onDoubleClick={item.onDoubleClick
+                                    ? item.onDoubleClick
+                                    : undefined}
+                                addItem={this.props.addItem}
+                                itemsDropdown={() => this.props.itemsDropdown ? this.props.itemsDropdown(index) : []}
+                                hexColor={item.hexColor}
+                                locked={item.locked}
+                                positionLocked={item.positionLocked}
+                                onAddItem={() => this.props.onAddItem
+                                    && this.props.onAddItem(index, item)}
+                            />
+                        ))}
+                        {(this.props.addItem && !this.props.readOnly) &&
+                            <div className={`table-list__add-item table-list__item--margin`}>
+                                <Tooltip text='Add item' flow='top' appendToBody={true}>
+                                    <div className='table-list__add-item--container sd-margin-x--auto'>
+                                        {this.dropDown()}
+                                    </div>
+                                </Tooltip>
+                            </div>
+                        }
+                    </div>
+                : (this.props.addItem && !this.props.readOnly) ? <div role='list' className={classes}>
+                    <div className={`table-list__add-item table-list__item--margin`}>
+                        <Tooltip text='Add item' flow='top' appendToBody={true}>
+                            <div className='table-list__add-item--container sd-margin-x--auto'>
+                                {this.dropDown()}
+                            </div>
+                        </Tooltip>
+                    </div>
+                </div>
+                    : null
+        );
+    }
+}
+
+export interface IPropsItem {
+    start?: React.ReactNode;
+    center?: React.ReactNode;
+    end?: React.ReactNode;
+    action?: React.ReactNode;
+    addItem?: boolean;
+    dragAndDrop?: boolean;
+    hexColor?: string;
+    showDragHandle?: 'always' | 'onHover' | 'none';
+    locked?: boolean;
+    positionLocked?: boolean;
+    onClick?(): void;
+    onDoubleClick?(): void;
+    onSelect?(): void;
+    onAddItem?(e: number): void;
+    itemsDropdown?(index?: number): Array<IMenuItem | ISubmenu | IMenuGroup | 'divider'>;
+}
+
+class TableListItem 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);
+    }
+
+    onActionMenuClick = (event: React.MouseEvent<HTMLElement>) => {
+        event.preventDefault();
+        event.stopPropagation();
+    }
+
+    render() {
+
+        let classes = classNames('table-list__item', {
+            'table-list__item--clickable': this.props.onClick,
+            'table-list__item--draggable': this.props.dragAndDrop,
+            'table-list__item--locked': this.props.locked,
+            'table-list__item--position-locked': this.props.positionLocked,
+            'table-list__item--drag-handles-always': !this.props.showDragHandle,
+            'table-list__item--drag-handles-none': this.props.showDragHandle === 'none',
+        });
+
+        return (
+            this.props.addItem ?
+                <div className='table-list__item-container'>
+                    <div
+                        role='listitem'
+                        onClick={() => this.onSingleClick()}
+                        onDoubleClick={() => this.onDoubleClick()}
+                        className={classes}>
+                        <div className='table-list__item-border' style={{ backgroundColor: this.props.hexColor }}></div>
+                        <div className='table-list__item-content'>
+                            <div className='table-list__item-content-block'>
+                                {this.props.start && this.props.start}
+                            </div>
+                            <div className='table-list__item-content-block table-list__item-content-block--center'>
+                                {this.props.center && this.props.center}
+                            </div>
+                            <div className='table-list__item-content-block'>
+                                {this.props.end && this.props.end}
+                            </div>
+                        </div>
+                        {this.props.action && <div className='table-list__slide-in-actions' onClick={this.onActionMenuClick}>
+                            {this.props.action}
+                        </div>}
+                    </div>
+                    <div className='table-list__add-bar-container'>
+                        <Tooltip text='Add item' flow='top' appendToBody={true}>
+                            <div className='table-list__add-bar'>
+                                <Dropdown
+                                    onChange={this.props.onAddItem}
+                                    items={this.props.itemsDropdown ? this.props.itemsDropdown() : []}>
+                                    <Button
+                                        type="primary"
+                                        icon="plus-large"
+                                        text="Add item"
+                                        size="small"
+                                        shape="round"
+                                        iconOnly={true}
+                                        onClick={() => false}
+                                    />
+                                </Dropdown>
+                            </div>
+                        </Tooltip>
+                    </div>
+                </div>
+                : <div
+                    role='listitem'
+                    className={`${classes} table-list__item--margin`}
+                    onClick={() => this.onSingleClick()}
+                    onDoubleClick={() => this.onDoubleClick()}>
+                    <div className='table-list__item-border' style={{ backgroundColor: this.props.hexColor }}></div>
+                    <div className='table-list__item-content'>
+                        <div className='table-list__item-content-block'>
+                            {this.props.start && this.props.start}
+                        </div>
+                        <div className='table-list__item-content-block table-list__item-content-block--center'>
+                            {this.props.center && this.props.center}
+                        </div>
+                        <div className='table-list__item-content-block'>
+                            {this.props.end && this.props.end}
+                        </div>
+                    </div>
+                    {this.props.action && <div className='table-list__slide-in-actions' onClick={this.onActionMenuClick}>
+                        {this.props.action}
+                    </div>}
+                </div>
         );
     }
 }
 
+class PortalItem extends React.PureComponent {
+    props: any;
+    render() {
+        const provided = this.props.provided;
+        const snapshot = this.props.snapshot;
+
+        const usePortal: boolean = snapshot.isDragging;
+
+        const child = (
+            <div
+                ref={provided.innerRef}
+                {...provided.draggableProps}
+                {...provided.dragHandleProps}>
+                <TableListItem
+                    dragAndDrop={this.props.dragAndDrop}
+                    start={this.props.item.start}
+                    center={this.props.item.center}
+                    end={this.props.item.end}
+                    action={this.props.item.action}
+                    onClick={this.props.item.onClick ? this.props.item.onClick : undefined}
+                    onDoubleClick={this.props.item.onDoubleClick
+                        ? this.props.item.onDoubleClick
+                        : undefined}
+                    addItem={this.props.addItem}
+                    itemsDropdown={this.props.itemsDropdown}
+                    hexColor={this.props.item.hexColor}
+                    locked={this.props.item.locked}
+                    positionLocked={this.props.item.positionLocked}
+                    onAddItem={() => this.props.onAddItem}
+                    showDragHandle={this.props.showDragHandle}
+                />
+            </div>
+        );
+
+        if (!usePortal) {
+            return child;
+        }
+
+        // if dragging - put the item in a portal
+        return ReactDOM.createPortal(child, document.body);
+    }
+}
+
 export {
     TableList, TableListItem
 };

package/app-typescript/components/Menu.tsx

@@ -131,7 +131,7 @@ export class Menu extends React.Component<IProps, {}> {
 
     render() {
         return (
-            <div>
+            <React.Fragment>
                 {
                     this.props.children(this.toggle)
                 }
@@ -167,7 +167,7 @@ export class Menu extends React.Component<IProps, {}> {
                         baseZIndex={this.props.zIndex ?? superdeskTopBarZIndex}
                     />
                 </div>
-            </div>
+            </React.Fragment>
         );
     }
 }