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

package/app-typescript/components/LeftMenu.tsx

@@ -3,150 +3,155 @@ import classNames from "classnames";
 import Scrollspy from "react-scrollspy";
 
 interface IMenuItem {
-  id: string;
-  label: string;
-  route?: string;
-  ref?: string;
-  onClick?(): void;
+    id: string;
+    label: string;
+    route?: string;
+    ref?: string;
+    onClick?(): void;
 }
 
 interface IMenuGroup {
-  label: string;
-  items: Array<IMenuItem>;
+    label: string;
+    items: Array<IMenuItem>;
 }
 
 interface IMenu {
-  className?: string;
-  groups: Array<IMenuGroup>;
-  activeItemId: string;
-  ariaLabel?: string;
-  scrollSpy?: string;
-  offset?: number;
-  reverseItemBorder?: boolean;
-  style?: "default" | "inverse" | "blanc";
-  size?: "medium" | "large";
-  onSelect(id: string, route: string): void;
+    className?: string;
+    groups: Array<IMenuGroup>;
+    activeItemId?: string;
+    scrollTo?: string;
+    ariaLabel?: string;
+    scrollSpy?: string;
+    offset?: number;
+    reverseItemBorder?: boolean;
+    style?: "default" | "inverse" | "blanc";
+    size?: "medium" | "large";
+    onSelect(id: string, route: string): void;
 }
 
 interface IState {
-  active: string;
+    active: string;
 }
 
 export class LeftMenu extends React.PureComponent<IMenu, IState> {
-  constructor(props: IMenu) {
-    super(props);
+    constructor(props: IMenu) {
+        super(props);
 
-    this.state = {
-      active: "",
-    };
-  }
+        this.state = {
+            active: this.props.activeItemId ? this.props.activeItemId : '',
+        };
+    }
+
+    handleClick(item: IMenuItem, event?: React.MouseEvent) {
+        event?.preventDefault();
+
+        this.setState({
+            active: item.id,
+        });
 
-  handleClick(item: IMenuItem, event?: React.MouseEvent) {
-    event?.preventDefault();
+        if (item.ref) {
+            return document
+                .getElementById(item.ref)
+                ?.scrollIntoView({ block: "nearest", behavior: "smooth" });
+        }
 
-    this.setState({
-      active: item.id,
-    });
+        if (item.onClick) {
+            return item.onClick();
+        }
 
-    if (item.ref) {
-      return document
-        .getElementById(item.ref)
-        ?.scrollIntoView({ block: "nearest", behavior: "smooth" });
+        this.props.onSelect(item.id, item.route ? item.route : "");
     }
 
-    if (item.onClick) {
-      return item.onClick();
+    componentDidMount() {
+        if (this.props.scrollTo) {
+            return document
+            .getElementById(this.props.scrollTo)
+            ?.scrollIntoView({ block: "nearest", behavior: "smooth" });
+        }
     }
 
-    this.props.onSelect(item.id, item.route ? item.route : "");
-  }
-
-  render() {
-    let classes = classNames(
-      "sd-left-nav",
-      {
-        "sd-left-nav--default": this.props.style === undefined,
-        [`sd-left-nav--${this.props.style}`]:
-          this.props.style || this.props.style !== undefined,
-        "sd-left-nav--medium": this.props.size === undefined,
-        [`sd-left-nav--${this.props.size}`]:
-          this.props.size || this.props.size !== undefined,
-          "sd-left-nav--reverse-border": this.props.reverseItemBorder,
-      },
-      this.props.className,
-    );
-
-    const scrollspyList = () => {
-      let scrollSpyList: Array<string> = [];
-      let scrollSpyItems: Array<JSX.Element> = [];
-      this.props.groups.map((element, index) => {
-        scrollSpyList = [...scrollSpyList, element.label];
-        scrollSpyItems.push(
-          <span className="sd-left-nav__group-header" key={"group-" + index}>
-            {element.label}
-          </span>,
+    render() {
+        let classes = classNames(
+            "sd-left-nav",
+            {
+                "sd-left-nav--default": this.props.style === undefined,
+                [`sd-left-nav--${this.props.style}`]:
+                this.props.style || this.props.style !== undefined,
+                "sd-left-nav--medium": this.props.size === undefined,
+                [`sd-left-nav--${this.props.size}`]:
+                this.props.size || this.props.size !== undefined,
+                "sd-left-nav--reverse-border": this.props.reverseItemBorder,
+            },
+            this.props.className,
         );
 
-        element.items.map((elementOfItem, indexOfItem) => {
-          scrollSpyList = [...scrollSpyList, `${elementOfItem.ref}`];
-
-          scrollSpyItems.push(
-            <a
-              key={"item-" + indexOfItem}
-              onClick={(event) => {
-                this.handleClick(elementOfItem, event);
-              }}
-              className="sd-left-nav__btn"
-            >
-              {elementOfItem.label}
-            </a>,
-          );
-        });
-      });
-
-      return (
-        <Scrollspy
-          offset={this.props.offset ? this.props.offset : -300}
-          items={scrollSpyList}
-          rootEl={this.props.scrollSpy}
-          currentClassName="sd-left-nav__btn--active"
-        >
-          {scrollSpyItems.map((element) => element)}
-        </Scrollspy>
-      );
-    };
-
-    const defaultList = () => {
-      return this.props.groups.map((group, i) => {
+        const scrollspyList = () => {
+            let scrollSpyList: Array<string> = [];
+            let scrollSpyItems: Array<JSX.Element> = [];
+            this.props.groups.map((element, index) => {
+                scrollSpyList = [...scrollSpyList, element.label];
+                scrollSpyItems.push(
+                    <span className="sd-left-nav__group-header" key={"group-" + index}>
+                        {element.label}
+                    </span>,
+                );
+
+                element.items.map((elementOfItem, indexOfItem) => {
+                scrollSpyList = [...scrollSpyList, `${elementOfItem.ref}`];
+
+                scrollSpyItems.push(
+                    <a key={"item-" + indexOfItem}
+                    onClick={(event) => {
+                    this.handleClick(elementOfItem, event);
+                    }}
+                    className="sd-left-nav__btn" >
+                        {elementOfItem.label}
+                    </a>,
+                );
+                });
+            });
+
+            return (
+                <Scrollspy
+                offset={this.props.offset ? this.props.offset : -300}
+                items={scrollSpyList}
+                rootEl={this.props.scrollSpy}
+                currentClassName="sd-left-nav__btn--active" >
+                    {scrollSpyItems.map((element) => element)}
+                </Scrollspy>
+            );
+        };
+
+        const defaultList = () => {
+            return this.props.groups.map((group, i) => {
+                return (
+                    <React.Fragment key={i}>
+                    <span className="sd-left-nav__group-header">{group.label}</span>
+                    {group.items.map((item, j) => {
+                        return (
+                        <button
+                        key={j}
+                        onClick={(event) => {
+                        this.handleClick(item, event);
+                        }}
+                        className={
+                        item.id === this.state.active
+                            ? "sd-left-nav__btn sd-left-nav__btn--active"
+                            : "sd-left-nav__btn"
+                        }>
+                            {item.label}
+                        </button>
+                        );
+                    })}
+                    </React.Fragment>
+                );
+            });
+        };
+
         return (
-          <React.Fragment key={i}>
-            <span className="sd-left-nav__group-header">{group.label}</span>
-            {group.items.map((item, j) => {
-              return (
-                <button
-                  key={j}
-                  onClick={(event) => {
-                    this.handleClick(item, event);
-                  }}
-                  className={
-                    item.id === this.state.active
-                      ? "sd-left-nav__btn sd-left-nav__btn--active"
-                      : "sd-left-nav__btn"
-                  }
-                >
-                  {item.label}
-                </button>
-              );
-            })}
-          </React.Fragment>
+            <nav className={classes} aria-label={this.props.ariaLabel}>
+                {this.props.scrollSpy ? scrollspyList() : defaultList()}
+            </nav>
         );
-      });
-    };
-
-    return (
-      <nav className={classes} aria-label={this.props.ariaLabel}>
-        {this.props.scrollSpy ? scrollspyList() : defaultList()}
-      </nav>
-    );
-  }
+    }
 }

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

@@ -4,48 +4,81 @@ import classNames from 'classnames';
 interface IPropsItem {
     action?: React.ReactNode;
     locked?: boolean;
-    itemColum: Array<{itemRow: Array<{content: any}>, border?: boolean, fullwidth?: boolean}>;
+    itemColum: Array<{ itemRow: Array<{ content: any }>, border?: boolean, fullwidth?: boolean }>;
     activated?: boolean;
     selected?: boolean;
-    fetched?: boolean;
+    archived?: boolean;
     loading?: boolean;
     onClick?(): void;
     onDoubleClick?(): void;
 }
 
 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);
+    }
+
+    onActionMenuClick = (event: React.MouseEvent<HTMLElement>) => {
+        event.preventDefault();
+        event.stopPropagation();
+    }
+
     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.fetched,
+            'fetched': this.props.archived,
             'actioning': this.props.loading,
-    });
+        });
 
         return (
-            <div className={classes} onClick={this.props.onClick} onDoubleClick={this.props.onDoubleClick}>
-                <div className="sd-list-item sd-shadow--z1">
-                    {this.props.locked
+            <div
+                role='listitem'
+                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>}
-                    {this.props.itemColum.map((item, index) => {
-                        return <div
+                {this.props.itemColum.map((item, index) => {
+                    return <div
                         className={`sd-list-item__column ${item.fullwidth && 'sd-list-item__column--grow'} ${!item.border && 'sd-list-item__column--no-border'}`}
                         key={index}>
                         {item.itemRow.map((e, i) => {
                             return (
                                 item.itemRow.length <= 1
-                                ? <React.Fragment key={i}>{e.content}</React.Fragment>
-                                : <div className="sd-list-item__row" key={i}>
-                                    {e.content}
-                                </div>
+                                    ? <React.Fragment key={i}>{e.content}</React.Fragment>
+                                    : <div className="sd-list-item__row" key={i}>
+                                        {e.content}
+                                    </div>
                             );
                         })}
-                        </div>;
-                    })}
-                    <div className="sd-list-item__action-menu">
-                        {this.props.action}
-                    </div>
+                    </div>;
+                })}
+                <div className="sd-list-item__action-menu" onClick={this.onActionMenuClick}>
+                    {this.props.action}
                 </div>
             </div>
         );
@@ -60,14 +93,14 @@ interface IProps {
         loading?: boolean,
         activated?: boolean,
         selected?: boolean,
-        fetched?: boolean,
+        archived?: boolean,
         onClick?(): void,
         onDoubleClick?(): void;
     }>;
 }
 
 interface IItemArray {
-    itemRow: Array<{content: React.ReactNode}>;
+    itemRow: Array<{ content: React.ReactNode }>;
     border?: boolean;
     fullwidth?: boolean;
 }
@@ -76,21 +109,21 @@ class ContentList extends React.PureComponent<IProps> {
     render() {
         let classes = classNames('sd-list-item-group sd-list-item-group--space-between-items');
         return (
-            <ul className={classes}>
+            <div role='list' className={classes}>
                 {this.props.items.map((item, index) => {
                     return <ContentListItem
-                    key={index}
-                    itemColum={item.itemColum}
-                    locked={item.locked}
-                    action={item.action}
-                    loading={item.loading}
-                    activated={item.activated}
-                    selected={item.selected}
-                    fetched={item.fetched}
-                    onClick={item.onClick}
-                    onDoubleClick={item.onDoubleClick} />;
+                        key={index}
+                        itemColum={item.itemColum}
+                        locked={item.locked}
+                        action={item.action}
+                        loading={item.loading}
+                        activated={item.activated}
+                        selected={item.selected}
+                        archived={item.archived}
+                        onClick={item.onClick}
+                        onDoubleClick={item.onDoubleClick} />;
                 })}
-            </ul>
+            </div>
         );
     }
 }