superdesk-ui-framework 3.0.1-beta.2 → 3.0.1-beta.5

package/app-typescript/components/Layouts/index.tsx

@@ -29,3 +29,15 @@ export { AuthoringMainContent } from './AuthoringMainContent';
 export { AuthoringInnerHeader } from './AuthoringInnerHeader';
 export { AuthoringInnerBody } from './AuthoringInnerBody';
 export { AuthorinInnerSideBar } from './AuthorinInnerSideBar';
+
+export { CoreLayout } from './CoreLayout';
+export { CoreLayoutContainer } from './CoreLayoutContainer';
+export { CoreLayoutTopMenu } from './CoreLayoutTopMenu';
+export { CoreLayoutMain } from './CoreLayoutMain';
+export { CoreLayoutSlideInMenu } from './CoreLayoutSlideInMenu';
+export { CoreLayoutFooter } from './CoreLayoutFooter';
+export { CoreLayoutOverlay } from './CoreLayoutOverlay';
+export { HamburgerButton } from './HamburgerButton';
+export { BottomBarAction } from './BottomBarAction';
+export { MainMenu } from './MainMenu';
+export { NotificationPanel } from './NotificationPanel';

package/app-typescript/components/LeftMenu.tsx

@@ -22,7 +22,9 @@ interface IMenu {
   ariaLabel?: string;
   scrollSpy?: string;
   offset?: number;
+  reverseItemBorder?: boolean;
   style?: "default" | "inverse" | "blanc";
+  size?: "medium" | "large";
   onSelect(id: string, route: string): void;
 }
 
@@ -66,6 +68,10 @@ export class LeftMenu extends React.PureComponent<IMenu, IState> {
         "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,
     );

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

@@ -47,13 +47,20 @@ interface IPropsActions {
 }
 
 class BoxedListActions extends React.PureComponent<IPropsActions> {
+    public rootElement?: HTMLDivElement | null;
+
     render() {
         let classes = classNames({
             'boxed-list__actions--static': this.props.slideIn === undefined,
             'boxed-list__actions--slide-in': this.props.slideIn === true || this.props.slideIn !== undefined,
         });
         return (
-            <div className={classes}>
+            <div
+                className={classes}
+                ref={(el) => {
+                    this.rootElement = el;
+                }}
+            >
                 {this.props.children}
             </div>
         );
@@ -71,21 +78,40 @@ interface IPropsItem {
     alignVertical?: 'start' | 'center';
     slideInActions?: boolean;
     selected?: boolean;
+    unread?: boolean;
     onClick?(): void;
 }
 
 class BoxedListItem extends React.PureComponent<IPropsItem> {
+    private actionsRef: BoxedListActions | null;
+
+    constructor(props: IPropsItem) {
+        super(props);
+
+        this.actionsRef = null;
+        this.handleClick = this.handleClick.bind(this);
+    }
+
+    handleClick(event: React.MouseEvent<HTMLLIElement, MouseEvent>) {
+        if (this.actionsRef?.rootElement != null && this.actionsRef.rootElement.contains(event.target as HTMLElement)) {
+            return;
+        } else {
+            this.props.onClick?.();
+        }
+    }
+
     render() {
         let classes = classNames('boxed-list__item', {
             'boxed-list__item--comfortable': this.props.density === undefined,
             [`boxed-list__item--${this.props.density}`]: this.props.density || this.props.density !== undefined,
             'boxed-list__item--clickable': this.props.clickable === true,
             'boxed-list__item--selected': this.props.selected,
+            'boxed-list__item--unread': this.props.unread,
             [`boxed-list__item--${this.props.type}`]: this.props.type || this.props.type !== undefined,
             [`boxed-list__item--align-${this.props.alignVertical}`]: this.props.alignVertical,
         });
         return (
-            <li className={classes} onClick={this.props.onClick}>
+            <li className={classes} onClick={this.handleClick}>
 
                 {this.props.media && (
                     <BoxedListMedia>
@@ -104,7 +130,12 @@ class BoxedListItem extends React.PureComponent<IPropsItem> {
                 )}
 
                 {this.props.actions && (
-                    <BoxedListActions slideIn={this.props.slideInActions}>
+                    <BoxedListActions
+                        slideIn={this.props.slideInActions}
+                        ref={(ref) => {
+                            this.actionsRef = ref;
+                        }}
+                    >
                         {this.props.actions}
                     </BoxedListActions>
                 )}
@@ -116,6 +147,7 @@ class BoxedListItem extends React.PureComponent<IPropsItem> {
 interface IProps {
     children?: React.ReactNode;
     density?: 'compact' | 'comfortable'; // defaults to 'compact'
+    className?: string;
 }
 
 class BoxedList extends React.PureComponent<IProps> {
@@ -123,7 +155,7 @@ class BoxedList extends React.PureComponent<IProps> {
         let classes = classNames('boxed-list', {
             'boxed-list--compact': this.props.density === undefined,
             [`boxed-list--${this.props.density}`]: this.props.density || this.props.density !== undefined,
-        });
+        }, this.props.className);
         return (
             <ul className={classes}>
                 {this.props.children}

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

@@ -7,7 +7,7 @@ interface IPropsItem {
     itemColum: Array<{itemRow: Array<{content: any}>, border?: boolean, fullwidth?: boolean}>;
     activated?: boolean;
     selected?: boolean;
-    fetched?: boolean;
+    archived?: boolean;
     loading?: boolean;
     onClick?(): void;
     onDoubleClick?(): void;
@@ -18,7 +18,7 @@ class ContentListItem extends React.PureComponent<IPropsItem> {
         let classes = classNames('sd-list-item sd-list-item-group sd-list-item-group--space-between-items', {
             '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,
     });
 
@@ -60,7 +60,7 @@ interface IProps {
         loading?: boolean,
         activated?: boolean,
         selected?: boolean,
-        fetched?: boolean,
+        archived?: boolean,
         onClick?(): void,
         onDoubleClick?(): void;
     }>;
@@ -86,7 +86,7 @@ class ContentList extends React.PureComponent<IProps> {
                     loading={item.loading}
                     activated={item.activated}
                     selected={item.selected}
-                    fetched={item.fetched}
+                    archived={item.archived}
                     onClick={item.onClick}
                     onDoubleClick={item.onDoubleClick} />;
                 })}

package/app-typescript/components/Menu.tsx

@@ -1,5 +1,9 @@
-import React, {SyntheticEvent} from 'react';
+import * as React from 'react';
+import {SyntheticEvent} from 'react';
+
 import {TieredMenu} from '@superdesk/primereact/tieredmenu';
+import {MenuItem as IPrimeMenuItem} from '@superdesk/primereact/components/menuitem/MenuItem';
+import {assertNever} from '../helpers';
 
 /**
  * Known issues:
@@ -58,6 +62,18 @@ interface IProps {
 
 const superdeskTopBarZIndex = 1030;
 
+function isSeparator(item: IMenuItem): item is ISeparator {
+    return (item as any)['separator'] === true;
+}
+
+function isMenuLeaf(item: IMenuItem): item is IMenuLeaf {
+    return (item as any)['onClick'] != null;
+}
+
+function isMenuBranch(item: IMenuItem): item is IMenuBranch {
+    return isSeparator(item) !== true && isMenuLeaf(item) !== true;
+}
+
 export class Menu extends React.Component<IProps, {}> {
     private menu: TieredMenu | null;
     private focusedBefore: Element | null;
@@ -73,26 +89,34 @@ export class Menu extends React.Component<IProps, {}> {
         this.toPrimeReactInterface = this.toPrimeReactInterface.bind(this);
     }
 
-    private toPrimeReactInterface(items: Array<any>): any {
+    private toPrimeReactInterface(items: Array<IMenuItem>): Array<IPrimeMenuItem> {
         return items.map((item) => {
-            if (item.separator != null) {
+            if (isSeparator(item)) {
                 return {separator: true};
-            } else if (item.children != null) {
+            } else if (isMenuBranch(item)) {
                 return {
                     label: item.label,
                     icon: item.icon,
                     items: this.toPrimeReactInterface(item.children),
                 };
-            } else {
+            } else if (isMenuLeaf(item)) {
                 return {
                     label: item.label,
                     icon: item.icon,
-                    command: (event: SyntheticEvent) => {
-                        this.close(event);
+                    command: (event) => {
+                        /**
+                         * a click on menu item should not trigger other click handlers
+                         * above in the DOM tree. e.g. if menu is inside a clickable list item
+                         */
+                        event.originalEvent.stopPropagation();
+
+                        this.close(event.originalEvent as unknown as SyntheticEvent);
                         item.onClick();
                     },
                     disabled: item.disabled,
                 };
+            } else {
+                return assertNever(item);
             }
         });
     }

package/app-typescript/components/Modal.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import { Dialog as PrimeDialog } from '@superdesk/primereact/dialog';
 import classNames from 'classnames';
 
@@ -14,6 +14,7 @@ interface IProps {
     headerTemplate?: JSX.Element | string;
     footerTemplate?: JSX.Element | string;
     closeOnEscape?: boolean;
+    zIndex?: number;
     onShow?(): void;
     onHide(): void;
 }
@@ -39,7 +40,9 @@ export class Modal extends React.Component<IProps, {}> {
                     maximized={this.props.maximized}
                     contentClassName={classes}
                     onShow={this.props.onShow}
-                    onHide={this.props.onHide}>
+                    onHide={this.props.onHide}
+                    zIndex={this.props.zIndex}
+                >
                     {this.props.children}
                 </PrimeDialog>
             </div>

package/app-typescript/components/MultiSelect.tsx

@@ -1,6 +1,8 @@
 import * as React from "react";
 import { MultiSelect as PrimeMultiSelect } from "@superdesk/primereact/multiselect";
 import classNames from 'classnames';
+import nextId from "react-id-generator";
+import { InputWrapper } from "./Form";
 
 interface IProps<T> {
     value: Array<T>;
@@ -12,26 +14,40 @@ interface IProps<T> {
     maxSelectedLabels?: number;
     selectedItemsLabel?: string;
     ariaLabelledBy?: string;
-    tabIndex?: string;
+    tabIndex?: string | any;
     filter?: boolean;
     showClear?: boolean;
     showSelectAll?: boolean;
     itemTemplate?(item: any): JSX.Element | undefined;
     selectedItemTemplate?(value: any): JSX.Element | undefined;
     onChange(newValue: string): void;
+    invalid?: boolean;
+    inlineLabel?: boolean;
+    labelHidden?: boolean;
+    tabindex?: number;
+    fullWidth?: boolean;
+    info?: string;
+    error?: string;
+    required?: boolean;
+    label?: string;
+    disabled?: boolean;
 }
 
 interface IState<T> {
     options: Array<T>;
     value: Array<T>;
+    invalid: boolean;
 }
 
 export class MultiSelect<T> extends React.Component<IProps<T>, IState<T>> {
+    private htmlId = nextId();
+
     constructor(props: IProps<T>) {
         super(props);
         this.state = {
             value: [],
             options: [],
+            invalid: this.props.invalid ? this.props.invalid : false,
         };
     }
 
@@ -43,7 +59,19 @@ export class MultiSelect<T> extends React.Component<IProps<T>, IState<T>> {
         });
 
         return (
-            <PrimeMultiSelect
+            <InputWrapper
+            label={this.props.label}
+            error={this.props.error}
+            required={this.props.required}
+            disabled={this.props.disabled}
+            invalid={this.state.invalid}
+            info={this.props.info}
+            inlineLabel={this.props.inlineLabel}
+            labelHidden={this.props.labelHidden}
+            fullWidth={this.props.fullWidth}
+            htmlId={this.htmlId}
+            tabindex={this.props.tabindex}>
+                <PrimeMultiSelect
                 panelClassName={classes}
                 value={this.props.value}
                 options={this.props.options}
@@ -60,10 +88,12 @@ export class MultiSelect<T> extends React.Component<IProps<T>, IState<T>> {
                 selectedItemTemplate={this.props.selectedItemTemplate}
                 maxSelectedLabels={this.props.maxSelectedLabels ?? 4}
                 selectedItemsLabel={this.props.selectedItemsLabel}
-                ariaLabelledBy={this.props.ariaLabelledBy}
-                tabIndex={this.props.tabIndex ?? '0'}
+                ariaLabelledBy={this.htmlId + 'label'}
+                tabIndex={this.props.tabIndex ? this.props.tabIndex : '0'}
                 showClear={this.props.showClear}
-            />
+                disabled={this.props.disabled}
+                inputId={this.htmlId} />
+            </InputWrapper>
         );
     }
 }

package/app-typescript/components/NavButton.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import classNames from 'classnames';
 import { Icon } from './Icon';
+import { Badge } from './Badge';
 interface IProps {
     id?: string;
     icon?: string;
@@ -11,6 +12,7 @@ interface IProps {
     state?: 'normal' | 'active'; // defaults to 'normal'
     value?: 'button' | 'submit' | 'reset'; // defaults to 'button'
     onClick(): void;
+    badgeValue?: string;
 }
 export class NavButton extends React.PureComponent<IProps> {
     render() {
@@ -28,6 +30,8 @@ export class NavButton extends React.PureComponent<IProps> {
                 onClick={this.props.onClick}
                 aria-label={this.props.text}
                 id={this.props.id}>
+                {this.props.badgeValue &&
+                    <Badge text={this.props.badgeValue} type='primary' />}
                 {this.props.icon ? <Icon name={this.props.icon} size={this.props.iconSize} /> : null}
                 {!this.props.icon && this.props.text ?
                     <span className="sd-navbtn__text">{this.props.text}</span> : null}

package/app-typescript/components/Navigation/BottomNav.tsx

@@ -0,0 +1,83 @@
+import * as React from 'react';
+import { Icon } from '../Icon';
+import { IconButton } from '../IconButton';
+import { clone } from 'lodash';
+
+interface IProps {
+    items: Array<IItem>;
+    side?: 'none' | 'left' | 'right';
+}
+
+interface IItem {
+    icon?: string;
+    active?: boolean;
+    title: string;
+    onClick(event: any): void;
+    onRemove(event: any): void;
+}
+
+interface IState {
+    index: number;
+    closeIndex: number;
+    items: Array<IItem>;
+}
+
+export class BottomNav extends React.PureComponent<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+        this.state = {
+            index: -1,
+            closeIndex: -1,
+            items: this.props.items,
+        };
+        this.handleClick = this.handleClick.bind(this);
+        this.handleDelete = this.handleDelete.bind(this);
+    }
+
+    handleClick(indexNumber: number) {
+        this.setState({
+            index: indexNumber,
+        });
+        if (this.state.index === indexNumber) {
+            this.setState({
+                closeIndex: indexNumber,
+            });
+        }
+    }
+    handleDelete(indexNumber: number) {
+        const newItems = clone(this.state.items);
+        newItems.splice(indexNumber, 1);
+
+        this.setState({
+            items: newItems,
+        });
+    }
+
+    render() {
+        return (
+            <ul className='sd-bottom-nav-list'>
+                {this.props.items.map((item, index) => {
+                    return (
+                        <li key={index}
+                            className={'sd-bottom-nav-list__item' + (item['active'] ? ' sd-bottom-nav-list__item--active' : (index === this.state.index ? ' sd-bottom-nav-list__item--active' : ''))}>
+                            <a className='sd-bottom-nav-list__item-title' onClick={(event) => {
+                                this.handleClick(index);
+                                item.onClick(event);
+                            }}>
+                                {item['icon'] &&
+                                    <Icon name={item['icon']} />
+                                }
+                                <span>{item.title}</span>
+                            </a>
+                            <IconButton
+                                size='small'
+                                icon="close-small"
+                                ariaValue='Delete'
+                                onClick={() => item.onRemove(index)} />
+                        </li>
+                    );
+                })}
+            </ul>
+        );
+    }
+}

package/app-typescript/components/Select.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
-import classNames from 'classnames';
+// import classNames from 'classnames';
 import nextId from "react-id-generator";
+import { InputWrapper } from './Form';
 
 interface ISelect {
     value?: string;
@@ -15,6 +16,10 @@ interface ISelect {
     tabindex?: number;
     fullWidth?: boolean;
     onChange(newValue: string): void;
+    boxedStyle?: boolean;
+    boxedLable?: boolean;
+    placeholder?: string;
+    size?: 'medium' | 'large' | 'x-large';
 }
 
 interface IState {
@@ -23,6 +28,7 @@ interface IState {
 }
 
 class Select extends React.Component<ISelect, IState> {
+    private htmlId = nextId();
     constructor(props: ISelect) {
         super(props);
 
@@ -34,51 +40,35 @@ class Select extends React.Component<ISelect, IState> {
         this.handleChange = this.handleChange.bind(this);
     }
 
-    htmlId = nextId();
-
     handleChange(event: React.ChangeEvent<HTMLSelectElement>) {
         this.setState({ value: event.target.value });
         this.props.onChange(event.target.value);
     }
 
     render() {
-        const classes = classNames('sd-input sd-input--is-select', {
-            'sd-input--inline-label': this.props.inlineLabel,
-            'sd-input--required': this.props.required,
-            'sd-input--disabled': this.props.disabled,
-            'sd-input--full-width': this.props.fullWidth,
-            'sd-input--invalid': this.props.invalid || this.state.invalid,
-        });
-        const labelClasses = classNames('sd-input__label', {
-            'a11y-only': this.props.labelHidden,
-        });
-
         return (
-            <div className={classes}>
-                <label className={labelClasses}
-                htmlFor={this.htmlId}
-                tabIndex={this.props.tabindex === undefined ? undefined : -1}>
-                    {this.props.label}
-                </label>
-
+            <InputWrapper
+            label={this.props.label}
+            error={this.props.error}
+            required={this.props.required}
+            disabled={this.props.disabled}
+            invalid={this.state.invalid}
+            info={this.props.info}
+            inlineLabel={this.props.inlineLabel}
+            labelHidden={this.props.labelHidden}
+            fullWidth={this.props.fullWidth}
+            htmlId={this.htmlId}
+            tabindex={this.props.tabindex}>
                 <select className='sd-input__select'
-                    id={this.htmlId}
-                    value={this.state.value}
-                    aria-describedby={this.htmlId}
-                    tabIndex={this.props.tabindex}
-                    onChange={this.handleChange}
-                    disabled={this.props.disabled}>
-                    {this.props.children}
+                id={this.htmlId}
+                value={this.state.value}
+                aria-describedby={this.htmlId}
+                tabIndex={this.props.tabindex}
+                onChange={this.handleChange}
+                disabled={this.props.disabled}>
+                {this.props.children}
                 </select>
-
-                <div className='sd-input__message-box'>
-                    {this.props.info && !this.props.invalid && !this.state.invalid ?
-                        <div className='sd-input__hint'>{this.props.info}</div> : null}
-                    {this.props.invalid || this.state.invalid ?
-                        <div className='sd-input__message'>{this.props.error}</div>
-                        : null}
-                </div>
-            </div>
+            </InputWrapper>
         );
     }
 }

package/app-typescript/components/SelectGrid.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import * as  React from 'react';
 import nextId from "react-id-generator";
 import { OverlayPanel } from '@superdesk/primereact/overlaypanel';
 import { Loader } from "./Loader";

package/app-typescript/components/SelectWithTemplate.tsx

@@ -1,5 +1,8 @@
 import * as React from 'react';
 import {Dropdown} from '@superdesk/primereact/dropdown';
+// import classNames from 'classnames';
+import nextId from "react-id-generator";
+import { InputWrapper } from './Form';
 
 interface IProps<T> {
     // Don't forget to cancel unfinished requests every the prop is called.
@@ -11,32 +14,41 @@ interface IProps<T> {
     itemTemplate: React.ComponentType<{option: T | null}>;
     noResultsFoundMessage: string;
     filterPlaceholder?: string;
-
     disabled?: boolean;
-    required?: boolean;
     autoFocus?: boolean;
     autoOpen?: boolean; // Avoid using this - the dropdown may cover important elements.
     width?: 'min' | '100%'; // defaults to min
     zIndex?: number;
     'data-test-id'?: string;
+    inlineLabel?: boolean;
+    required?: boolean;
+    fullWidth?: boolean;
+    invalid?: boolean;
+    labelHidden?: boolean;
+    tabindex?: number;
+    label?: string;
+    info?: string;
+    error?: string;
 }
 
 interface IState<T> {
     options: Array<T>;
     loading: boolean;
+    invalid: boolean;
 }
 
 const labelKey = 'label';
 
 export class SelectWithTemplate<T> extends React.Component<IProps<T>, IState<T>> {
     componentRef: Dropdown | null;
-
+    private htmlId = nextId();
     constructor(props: IProps<T>) {
         super(props);
 
         this.state = {
             options: [],
             loading: false,
+            invalid: this.props.invalid ? this.props.invalid : false,
         };
 
         this.componentRef = null;
@@ -87,7 +99,21 @@ export class SelectWithTemplate<T> extends React.Component<IProps<T>, IState<T>>
         const fakePlaceholderWithNonBreakingSpace = ' ';
 
         return (
-            <Dropdown
+            <InputWrapper
+            label={this.props.label}
+            error={this.props.error}
+            required={this.props.required}
+            disabled={this.props.disabled}
+            invalid={this.state.invalid}
+            info={this.props.info}
+            inlineLabel={this.props.inlineLabel}
+            labelHidden={this.props.labelHidden}
+            fullWidth={this.props.fullWidth}
+            htmlId={this.htmlId}
+            tabindex={this.props.tabindex}>
+                <Dropdown
+                inputId={this.htmlId}
+                ariaLabelledBy={this.htmlId + 'label'}
                 value={valueInternal}
                 options={optionsInternal}
                 onChange={(e) => {
@@ -108,7 +134,6 @@ export class SelectWithTemplate<T> extends React.Component<IProps<T>, IState<T>>
                 loading={loading}
                 onFilterInputChange={(searchString) => {
                     this.setState({loading: true});
-
                     getItems(searchString).then((_options) => {
                         this.setState({options: _options, loading: false});
                     });
@@ -117,8 +142,8 @@ export class SelectWithTemplate<T> extends React.Component<IProps<T>, IState<T>>
                 style={width === '100%' ? {display: 'flex', width: '100%'} : {}}
                 ref={(componentRef) => {
                     this.componentRef = componentRef;
-                }}
-            />
+                }}/>
+            </InputWrapper>
         );
     }
 }

package/app-typescript/components/Skeleton.tsx

@@ -1,5 +1,5 @@
 
-import React from 'react';
+import * as  React from 'react';
 import classNames from 'classnames';
 
 interface IProps {