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

package/app-typescript/components/Form/InputWrapper.tsx

@@ -0,0 +1,79 @@
+import * as React from 'react';
+import classNames from 'classnames';
+
+interface IPropsBase {
+    label?: string;
+    children: React.ReactNode;
+    maxLength?: number;
+    info?: string;
+    error?: string;
+    required?: boolean;
+    disabled?: boolean;
+    invalid?: boolean;
+    inlineLabel?: boolean;
+    labelHidden?: boolean;
+    tabindex?: number;
+    fullWidth?: boolean;
+    boxedStyle?: boolean;
+    boxedLable?: boolean;
+    value?: string | number;
+    htmlId?: string;
+    size?: 'medium' | 'large' | 'x-large'; // default: 'medium'
+}
+
+interface IState {
+    value: string | number;
+}
+
+export class InputWrapper extends React.Component<IPropsBase, IState> {
+    constructor(props: IPropsBase) {
+        super(props);
+
+        this.state = {
+            value: this.props.value ?? '',
+        };
+    }
+
+    render() {
+        const classes = classNames('sd-input', {
+            '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,
+            'sd-input--medium': this.props.size === undefined,
+            [`sd-input--${this.props.size}`]: this.props.size || this.props.size !== undefined,
+            'sd-input--boxed-style': this.props.boxedStyle,
+            'sd-input--boxed-label': this.props.boxedLable,
+        });
+        const labelClasses = classNames('sd-input__label', {
+            'a11y-only': this.props.labelHidden,
+            'sd-input__label--boxed': this.props.boxedLable,
+        });
+
+        return (
+            <div className={classes}>
+                <label className={labelClasses} htmlFor={this.props.htmlId} id={this.props.htmlId + 'label'}
+                        tabIndex={this.props.tabindex === undefined ? undefined : -1}>
+                    {this.props.label}
+                </label>
+                <div className="sd-input__input-container">
+                    {this.props.children}
+                </div>
+                {this.props.maxLength
+                    ? <div className='sd-input__char-count'>
+                        {this.props.value?.toString().length} / {this.props.maxLength}
+                    </div>
+                    : null}
+                <div className='sd-input__message-box'>
+                    {this.props.info && !this.props.invalid && !this.props.invalid
+                        ? <div className='sd-input__hint'>{this.props.info}</div>
+                        : null}
+                    {this.props.invalid || this.props.invalid
+                        ? <div className='sd-input__message'>{this.props.error}</div>
+                        : null}
+                </div>
+            </div>
+        );
+    }
+}

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

@@ -3,3 +3,7 @@ export { FormGroup } from './FormGroup';
 export { FormItem } from './FormItem';
 export { FormText } from './FormText';
 export { FormLabel } from './FormLabel';
+export { InputWrapper } from './InputWrapper';
+export { InputBase } from './InputBase';
+export { InputNew } from './InputNew';
+export { FormRowNew } from './FormRowNew';

package/app-typescript/components/Input.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 IPropsBase {
     label?: string;
@@ -79,53 +80,35 @@ export class Input extends React.Component<IProps, IState> {
     }
 
     render() {
-        const classes = classNames('sd-input', {
-            '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,
-            'sd-input--medium': this.props.size === undefined,
-            [`sd-input--${this.props.size}`]: this.props.size || this.props.size !== undefined,
-            'sd-input--boxed-style': this.props.boxedStyle,
-            'sd-input--boxed-label': this.props.boxedLable,
-        });
-        const labelClasses = classNames('sd-input__label', {
-            'a11y-only': this.props.labelHidden,
-            'sd-input__label--boxed': this.props.boxedLable,
-        });
 
         return (
-            <div className={classes}>
-                <label className={labelClasses} htmlFor={this.htmlId} id={this.htmlId + 'label'}
-                        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}
+            value={this.state.value}
+            invalid={this.props.invalid}
+            info={this.props.info}
+            maxLength={this.props.maxLength}
+            inlineLabel={this.props.inlineLabel}
+            labelHidden={this.props.labelHidden}
+            size={this.props.size ?? 'medium'}
+            fullWidth={this.props.fullWidth}
+            htmlId={this.htmlId}
+            boxedStyle={this.props.boxedStyle}
+            boxedLable={this.props.boxedLable}
+            tabindex={this.props.tabindex}>
                 <input className='sd-input__input'
-                    type={this.props.type ?? 'text'}
-                    id={this.htmlId}
-                    value={this.state.value}
-                    aria-describedby={this.htmlId + 'label'}
-                    tabIndex={this.props.tabindex}
-                    onChange={this.handleChange}
-                    placeholder={this.props.placeholder}
-                    disabled={this.props.disabled} />
-
-                {this.props.maxLength ?
-                    <div className='sd-input__char-count'>
-                        {this.state.value.toString().length} / {this.props.maxLength}
-                    </div>
-                    : null}
-
-                <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>
+                type={this.props.type ?? 'text'}
+                id={this.htmlId}
+                value={this.state.value}
+                aria-describedby={this.htmlId + 'label'}
+                tabIndex={this.props.tabindex}
+                onChange={this.handleChange}
+                placeholder={this.props.placeholder}
+                disabled={this.props.disabled} />
+            </InputWrapper>
         );
     }
 }

package/app-typescript/components/Label.tsx

@@ -8,6 +8,7 @@ interface IProps {
     size?: 'small' | 'normal' | 'large'; // defaults to 'normal'
     onClick?(): void;
     noTransform?: boolean;
+    hexColor?: string;
     style?: 'filled' | 'hollow' | 'translucent'; // defaults to 'filled'
 }
 export class Label extends React.PureComponent<IProps> {
@@ -21,17 +22,71 @@ export class Label extends React.PureComponent<IProps> {
             [`hollow-${this.props.color}`]: this.props.color && this.props.style === 'hollow',
         });
         if (this.props.link || this.props.onClick) {
-            return (
-                <a href={this.props.link} className={classes} onClick={this.props.onClick}>
-                    {this.props.text}
-                </a>
-            );
+            if (this.props.style === 'hollow') {
+                return (
+                    <a className={classes}
+                        href={this.props.link}
+                        onClick={this.props.onClick}
+                        style={{color: this.props.hexColor, borderColor: this.props.hexColor}}>
+                        {this.props.text}
+                    </a>
+                );
+            } else if (this.props.style === 'translucent') {
+                return (
+                    <a className={classes}
+                        href={this.props.link}
+                        onClick={this.props.onClick}
+                        style={{color: this.props.hexColor, backgroundColor: `${this.props.hexColor}33`}}>
+                        {this.props.text}
+                    </a>
+                );
+            } else  {
+                return (
+                    <a className={classes}
+                        href={this.props.link}
+                        onClick={this.props.onClick} style={{backgroundColor: this.props.hexColor}}>
+                        {this.props.text}
+                    </a>
+                );
+            }
         } else {
-            return (
-                <span className={classes}>
-                    {this.props.text}
-                </span>
-            );
+             if (this.props.style === 'hollow') {
+                return (
+                    <span className={classes}
+                        style={{color: this.props.hexColor, borderColor: this.props.hexColor}}>
+                        {this.props.text}
+                    </span>
+                );
+            } else if (this.props.style === 'translucent') {
+                return (
+                    <span className={classes}
+                        style={{color: this.props.hexColor, backgroundColor: `${this.props.hexColor}33`}}>
+                        {this.props.text}
+                    </span>
+                );
+            } else {
+                return (
+                    <span className={classes}
+                    style={this.props.hexColor
+                    ? {backgroundColor: this.props.hexColor, color: getTextColor(this.props.hexColor)}
+                    : undefined}>
+                        {this.props.text}
+                    </span>
+                );
+            }
         }
     }
 }
+
+export function getTextColor(backgroundColor: string): 'black' | 'white' | undefined {
+    if (backgroundColor) {
+        const r = parseInt(backgroundColor.substr(1, 2), 16);
+        const g = parseInt(backgroundColor.substr(3, 2), 16);
+        const b = parseInt(backgroundColor.substr(5, 2), 16);
+        const yiq = ((r * 299) + (g * 587) + (b * 114)) / 1000;
+
+        return (yiq >= 128) ? 'black' : 'white';
+    } else {
+        return;
+    }
+}

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

@@ -6,6 +6,7 @@ interface IProps {
     side?: 'left' | 'right';
     background?: 'transparent' | 'light' | 'grey' | 'dark';
     open?: boolean;
+    large?: boolean;
 }
 
 export class AuthoringContainer extends React.PureComponent<IProps> {
@@ -18,7 +19,7 @@ export class AuthoringContainer extends React.PureComponent<IProps> {
         });
         return (
             <div className={classes}>
-                <div className='sd-editor__container'>
+                <div className={`sd-editor__container ${this.props.large ? 'sd-editor__container--large' : ''}`}>
                     {this.props.children}
                 </div>
             </div>

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

@@ -16,6 +16,7 @@ interface IProps {
     header?: React.ReactNode;
     main?: React.ReactNode;
     sideBar?: React.ReactNode;
+    sideBarClosed?: boolean;
     sidePanel?: React.ReactNode;
     sideOverlay?: React.ReactNode;
     sideOverlayOpen?: boolean;
@@ -56,7 +57,7 @@ export class AuthoringFrame extends React.PureComponent<IProps> {
                     </AuthoringFrameSidePanelOverlay>
                 )}
                 {this.props.sideBar && (
-                    <AuthoringFrameRightBar>
+                    <AuthoringFrameRightBar closed={this.props.sideBarClosed}>
                         {this.props.sideBar}
                     </AuthoringFrameRightBar>
                 )}

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

@@ -2,12 +2,31 @@ import * as React from 'react';
 
 interface IProps {
     children?: React.ReactNode;
+    closed?: boolean;
 }
 
-export class AuthoringFrameRightBar extends React.PureComponent<IProps> {
+interface IState {
+    children?: React.ReactNode;
+    closed?: boolean;
+}
+
+export class AuthoringFrameRightBar extends React.PureComponent<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+        this.state = {
+            closed: this.props.closed ? this.props.closed : false,
+        };
+    }
+    componentDidUpdate(prevProps: Readonly<IProps>): void {
+        if (prevProps.closed !== this.props.closed) {
+            this.setState({
+                closed: this.props.closed,
+            });
+        }
+    }
     render() {
         return (
-            <div className="sd-editor-grid__sidetabs-bar">
+            !this.state.closed && <div className="sd-editor-grid__sidetabs-bar">
                 {this.props.children}
             </div>
         );

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

@@ -16,7 +16,7 @@ export class AuthoringInnerHeader extends React.PureComponent<IProps, IState> {
         super(props);
 
         this.state = {
-            collapsed: false,
+            collapsed: this.props.collapsed ? this.props.collapsed : false,
         };
     }
 

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

@@ -31,8 +31,10 @@ export class AuthoringMain extends React.PureComponent<IProps> {
                 )}
                 <AuthoringMainContent>
                     {this.props.authoringHeader && (
-                        <AuthoringInnerHeader headerPadding={this.props.headerPadding}>
-                        {this.props.authoringHeader}
+                        <AuthoringInnerHeader
+                        headerPadding={this.props.headerPadding}
+                        collapsed={this.props.headerCollapsed}>
+                            {this.props.authoringHeader}
                     </AuthoringInnerHeader>
                     )}
                     {this.props.authoringBookmarks && (

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

@@ -22,6 +22,7 @@ interface IProps {
     menuId?: string;
     ariaControls?: string;
     buttonAnimation?: 'spin' | 'squeeze' | 'none';
+    editorFullWidth?: boolean;
 }
 
 export class CoreLayout extends React.PureComponent<IProps> {
@@ -43,7 +44,7 @@ export class CoreLayout extends React.PureComponent<IProps> {
                         {this.props.topMenu}
                     </CoreLayoutTopMenu>
                 )}
-                <CoreLayoutMain>
+                <CoreLayoutMain editorFullWidth={this.props.editorFullWidth}>
                         {this.props.children}
                 </CoreLayoutMain>
                 {this.props.footer && (

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

@@ -1,14 +1,20 @@
 import * as React from 'react';
+import classNames from 'classnames';
 
 interface IProps {
     children?: React.ReactNode;
     id?: string;
+    editorFullWidth?: boolean;
 }
 
 export class CoreLayoutMain extends React.PureComponent<IProps> {
     render() {
+        const classes = classNames('sd-content sd-content-wrapper', {
+            'sd-content-wrapper--editor-full': this.props.editorFullWidth,
+        },
+    );
         return (
-            <section id={this.props.id} className='sd-content sd-content-wrapper'>
+            <section id={this.props.id} className={classes}>
                 {this.props.children}
             </section>
         );

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

@@ -26,7 +26,7 @@ export const Layout = ({
                 {children}
             </section>
             <footer className='sd-bottom-bar'>
-                This is the footer.
+                Footer
             </footer>
         </div>
     );