@progress/kendo-themes-html 5.0.0-beta.0 → 5.0.0-beta.4

package/src/splitbutton/splitbutton.jsx

@@ -1,10 +1,12 @@
-import { Component, globalDefaultProps } from '../component';
+import * as styles from '../../utils/styles';
+import { Component, globalDefaultProps } from '../component/index';
 import { ButtonStatic } from '../button/index';
 
 class SplitButton extends Component {
 
     init() {
         this._props.text = this.element.innerHTML;
+        this._props.children = [];
     }
 
     render() {
@@ -20,7 +22,6 @@ function SplitButtonStatic(props) {
 
         size,
         rounded,
-        shape,
 
         fillMode,
         themeColor,
@@ -45,19 +46,7 @@ function SplitButtonStatic(props) {
         ownClassName,
         'k-split-button',
         'k-button-group',
-        {
-            'k-focus': focus === true
-        }
-    ];
-
-
-    let legacySplitButtonClasses = [
-        ownClassName,
-        'k-split-button',
-        'k-button-group',
-        {
-            'k-state-focused': focus === true
-        }
+        styles.roundedClass( rounded )
     ];
 
     // Augment attributes
@@ -68,9 +57,42 @@ function SplitButtonStatic(props) {
         : {};
 
     if (legacy) {
+
+        let legacySplitButtonClasses = [
+            ownClassName,
+            'k-split-button',
+            'k-button-group'
+        ];
+
         return (
             <div className={legacySplitButtonClasses} {...ariaAttr} {...htmlAttributes}>
-                <ButtonStatic legacy={true}></ButtonStatic>
+                <ButtonStatic
+                    text={text}
+                    icon={icon}
+
+                    size={size}
+                    rounded={rounded}
+                    fillMode={fillMode}
+                    themeColor={themeColor}
+
+                    hover={hover}
+                    focus={focus}
+                    active={active}
+                    selected={selected}
+                    disabled={disabled}
+                ></ButtonStatic>
+                <ButtonStatic
+                    className="k-split-button-arrow"
+
+                    icon={arrowIconName}
+
+                    size={size}
+                    rounded={rounded}
+                    fillMode={fillMode}
+                    themeColor={themeColor}
+
+                    disabled={disabled}
+                ></ButtonStatic>
             </div>
         );
     }
@@ -79,29 +101,31 @@ function SplitButtonStatic(props) {
         <div className={splitButtonClasses} {...ariaAttr} {...htmlAttributes}>
             <ButtonStatic
                 text={text}
-                disabled={disabled}
-                hover={hover}
-                active={active}
-                selected={selected}
-                focus={focus}
+                icon={icon}
+
                 size={size}
                 rounded={rounded}
-                shape={shape}
                 fillMode={fillMode}
                 themeColor={themeColor}
-                icon={icon}></ButtonStatic>
-            <ButtonStatic
-                disabled={disabled}
+
                 hover={hover}
+                focus={focus}
                 active={active}
                 selected={selected}
-                focus={focus}
+                disabled={disabled}
+            ></ButtonStatic>
+            <ButtonStatic
+                className="k-split-button-arrow"
+
+                icon={arrowIconName}
+
                 size={size}
                 rounded={rounded}
-                shape={shape}
                 fillMode={fillMode}
                 themeColor={themeColor}
-                icon={arrowIconName ? arrowIconName : 'arrow-s'}></ButtonStatic>
+
+                disabled={disabled}
+            ></ButtonStatic>
         </div>
     );
 }
@@ -112,12 +136,13 @@ SplitButtonStatic.defaultProps = {
     text: '',
     icon: '',
 
+    arrowIconName: 'arrow-s',
+
     className: '',
     type: 'button',
 
     size: 'medium',
     rounded: 'medium',
-    shape: 'rectangle',
 
     fillMode: 'solid',
     themeColor: 'base'
@@ -129,12 +154,11 @@ SplitButtonStatic.propTypes = {
 
     arrowIconName: typeof '',
 
-    size: typeof [ 'none', 'small', 'medium', 'large' ],
-    rounded: typeof [ 'none', '0', 'small', 'medium', 'large', 'pill', 'circle' ],
-    shape: typeof [ 'none', 'rectangle', 'square' ],
+    size: typeof [ null, 'small', 'medium', 'large' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'full' ],
 
-    fillMode: typeof [ 'none', 'solid', 'flat', 'outline', 'link' ],
-    themeColor: typeof [ 'none', 'surface', 'base', 'primary' ],
+    fillMode: typeof [ null, 'solid', 'flat', 'outline', 'link' ],
+    themeColor: typeof [ null, 'surface', 'base', 'primary' ],
 
     hover: typeof false,
     focus: typeof false,

package/src/switch/README.md

@@ -1,12 +1,12 @@
 ```html
 <!-- default rendering -->
-<span class="k-switch k-switch-on k-switch-md k-rounded-pill">
-    <span class="k-switch-track k-rounded-pill">
+<span class="k-switch k-switch-on k-switch-md k-rounded-full">
+    <span class="k-switch-track k-rounded-full">
         <span class="k-switch-label-on">On</span>
         <span class="k-switch-label-off">Off</span>
     </span>
     <span class="k-switch-thumb-wrap">
-        <span class="k-switch-thumb k-rounded-pill"></span>
+        <span class="k-switch-thumb k-rounded-full"></span>
     </span>
 </span>
 

package/src/switch/switch.jsx

@@ -1,5 +1,5 @@
 import * as styles from '../../utils/styles';
-import { Component, globalDefaultProps } from '../component';
+import { Component, globalDefaultProps } from '../component/index';
 
 class Switch extends Component {
     render() {
@@ -105,8 +105,8 @@ SwitchStatic.defaultProps = {
     offLabel: '',
 
     size: 'medium',
-    trackRounded: 'pill',
-    thumbRounded: 'pill'
+    trackRounded: 'full',
+    thumbRounded: 'full'
 };
 SwitchStatic.propTypes = {
     checked: typeof false,
@@ -115,8 +115,8 @@ SwitchStatic.propTypes = {
     offLabel: typeof '',
 
     size: typeof [ null, 'small', 'medium', 'large' ],
-    trackRounded: typeof [ null, '0', 'small', 'medium', 'large', 'pill', 'circle' ],
-    thumbRounded: typeof [ null, '0', 'small', 'medium', 'large', 'pill', 'circle' ],
+    trackRounded: typeof [ null, 'small', 'medium', 'large', 'full' ],
+    thumbRounded: typeof [ null, 'small', 'medium', 'large', 'full' ],
 
     hover: typeof false,
     focus: typeof false,

package/src/textarea/textarea.jsx

@@ -1,4 +1,4 @@
-import { globalDefaultProps } from '../component';
+import { globalDefaultProps } from '../component/index';
 import { Input, InputStatic, InputInnerTextareaStatic } from '../input/index';
 
 class Textarea extends Input {
@@ -117,7 +117,7 @@ TextareaStatic.propTypes = {
     suffix: typeof '#fragment',
 
     size: typeof [ null, 'small', 'medium', 'large' ],
-    rounded: typeof [ null, 'small', 'medium', 'large', 'pill' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'full' ],
 
     fillMode: typeof [ null, 'solid', 'flat', 'outline' ],
 

package/src/textbox/textbox.jsx

@@ -1,4 +1,4 @@
-import { globalDefaultProps } from '../component';
+import { globalDefaultProps } from '../component/index';
 import { Input, InputStatic, InputInnerInputStatic } from '../input/index';
 import { InputValidationIconStatic, InputLoadingIconStatic, InputClearValueStatic } from '../input/index';
 
@@ -140,7 +140,7 @@ TextboxStatic.propTypes = {
     suffix: typeof '#fragment',
 
     size: typeof [ null, 'small', 'medium', 'large' ],
-    rounded: typeof [ null, 'small', 'medium', 'large', 'pill' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'full' ],
 
     fillMode: typeof [ null, 'solid', 'flat', 'outline' ],
 

package/src/timepicker/timepicker.jsx

@@ -1,4 +1,4 @@
-import { globalDefaultProps } from '../component';
+import { globalDefaultProps } from '../component/index';
 import { Input, InputStatic, InputInnerInputStatic } from '../input/index';
 import { InputValidationIconStatic, InputLoadingIconStatic, InputClearValueStatic } from '../input/index';
 import { ButtonStatic } from '../button/index';
@@ -76,17 +76,15 @@ function TimePickerStatic(props) {
             'k-widget',
             'k-timepicker',
             {
+                'k-state-hover': hover === true,
+                'k-state-focus': focus === true,
+                'k-state-invalid': invalid === true,
                 'k-state-disabled': disabled === true
             }
         ];
 
         let legacyWrapClasses = [
-            'k-picker-wrap',
-            {
-                'k-state-hover': hover === true,
-                'k-state-focused': focus === true,
-                'k-state-invalid': invalid === true
-            }
+            'k-picker-wrap'
         ];
 
         return (
@@ -150,7 +148,7 @@ TimePickerStatic.propTypes = {
     suffix: typeof '#fragment',
 
     size: typeof [ null, 'small', 'medium', 'large' ],
-    rounded: typeof [ null, 'small', 'medium', 'large', 'pill' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'full' ],
 
     fillMode: typeof [ null, 'solid', 'flat', 'outline' ],
 

package/src/treeview/index.js

@@ -0,0 +1,4 @@
+export * from './treeview.jsx';
+export * from './treeview-group.jsx';
+export * from './treeview-item.jsx';
+export * from './treeview-leaf.jsx';

package/src/treeview/treeview-group.jsx

@@ -0,0 +1,70 @@
+import { Component, globalDefaultProps } from '../component/index';
+
+class TreeviewGroup extends Component {
+    render() {
+        return <TreeviewGroupStatic {...this.props} />;
+    }
+}
+
+function TreeviewGroupStatic(props) {
+    const {
+        className: ownClassName,
+
+        items,
+
+        aria,
+        legacy,
+
+        ...htmlAttributes
+    } = props;
+
+    let treeviewULClasses = [
+        ownClassName,
+        'k-treeview-group'
+    ];
+
+    let ariaAttr = aria
+        ? {}
+        : {};
+
+    if (legacy) {
+
+        let legacyTreeviewULClasses = [
+            ownClassName,
+            'k-group',
+        ];
+
+        return (
+            <ul className={legacyTreeviewULClasses} {...ariaAttr} {...htmlAttributes}>
+                {items}
+            </ul>
+        );
+    }
+
+    return (
+        <ul className={treeviewULClasses} {...ariaAttr} {...htmlAttributes}>
+            {items}
+        </ul>
+    );
+}
+
+TreeviewGroupStatic.defaultProps = {
+    ...globalDefaultProps,
+
+    children: [],
+    items: []
+};
+
+TreeviewGroupStatic.propTypes = {
+    children: typeof [],
+    className: typeof '',
+
+    items: typeof [],
+
+    aria: typeof false,
+    legacy: typeof false,
+
+    htmlAttributes: typeof []
+};
+
+export { TreeviewGroup, TreeviewGroupStatic };

package/src/treeview/treeview-item.jsx

@@ -0,0 +1,142 @@
+import { Component, globalDefaultProps } from '../component/index';
+import { TreeviewGroupStatic } from './treeview-group.jsx';
+import { TreeviewLeafStatic } from './treeview-leaf.jsx';
+import { IconStatic } from '../icon/index';
+import { CheckboxStatic } from '../checkbox/index';
+
+class TreeviewItem extends Component {
+    render() {
+        return <TreeviewItemStatic {...this.props} />;
+    }
+}
+
+function TreeviewItemStatic(props) {
+    const {
+        className: ownClassName,
+        leafClassName,
+
+        items,
+        expanded,
+        hasChildren: _hasChildren,
+
+        text,
+
+        showIcon,
+        iconName,
+        showCheckbox,
+        checked,
+
+        hover,
+        focus,
+        selected,
+        disabled,
+
+        aria,
+        legacy,
+
+        ...htmlAttributes
+    } = props;
+
+    const leafProps = {
+        className: leafClassName,
+        text,
+        showIcon,
+        iconName,
+        hover,
+        focus,
+        selected
+    };
+
+    const hasChildren = _hasChildren || items.length > 0;
+
+    let treeviewItemClasses = [
+        ownClassName,
+        'k-treeview-item',
+        {
+            'k-disabled': disabled === true
+        }
+    ];
+
+    let ariaAttr = aria
+        ? {}
+        : {};
+
+    if (legacy) {
+
+        let legacyTreeviewItemClasses = [
+            ownClassName,
+            'k-item',
+            {
+                'k-state-disabled': disabled === true
+            }
+        ];
+
+        return (
+            <li className={legacyTreeviewItemClasses} {...ariaAttr} {...htmlAttributes}>
+                <span className="k-mid">
+                    {hasChildren && <span className="k-treeview-toggle"><IconStatic name={expanded ? 'collapse' : 'expand'} /></span>}
+                    {showCheckbox && <CheckboxStatic checked={checked} />}
+                    <TreeviewLeafStatic {...leafProps} />
+                </span>
+                {expanded && hasChildren && <TreeviewGroupStatic items={items} />}
+            </li>
+        );
+    }
+
+    return (
+        <li className={treeviewItemClasses} {...ariaAttr} {...htmlAttributes}>
+            <span className="k-treeview-mid">
+                {hasChildren && <span className="k-treeview-toggle"><IconStatic name={expanded ? 'collapse' : 'expand'} /></span>}
+                {showCheckbox && <CheckboxStatic checked={checked} />}
+                <TreeviewLeafStatic {...leafProps} />
+            </span>
+            {expanded && hasChildren && <TreeviewGroupStatic items={items} />}
+        </li>
+    );
+}
+
+TreeviewItemStatic.defaultProps = {
+    ...globalDefaultProps,
+
+    leafClassName: '',
+
+    text: '',
+
+    items: [],
+    expanded: false,
+    hasChildren: false,
+
+    showIcon: false,
+    iconName: '',
+    showCheckbox: false,
+    checked: false,
+};
+
+TreeviewItemStatic.propTypes = {
+    children: typeof [],
+    className: typeof '',
+    leafClassName: typeof '',
+
+    text: typeof '',
+
+    items: [],
+    expanded: typeof false,
+    hasChildren: typeof false,
+
+    showIcon: typeof false,
+    iconName: typeof '',
+    showCheckbox: typeof false,
+    checked: typeof false,
+
+    hover: typeof false,
+    focus: typeof false,
+    selected: typeof false,
+    disabled: typeof false,
+
+    aria: typeof false,
+    legacy: typeof false,
+
+    htmlAttributes: typeof []
+};
+
+export { TreeviewItem, TreeviewItemStatic };

package/src/treeview/treeview-leaf.jsx

@@ -0,0 +1,99 @@
+import { Component, globalDefaultProps } from '../component/index';
+import { IconStatic } from '../icon/index';
+
+class TreeviewLeaf extends Component {
+    render() {
+        return <TreeviewLeafStatic {...this.props} />;
+    }
+}
+
+function TreeviewLeafStatic(props) {
+    const {
+        className: ownClassName,
+
+        text,
+
+        showIcon,
+        iconName,
+
+        hover,
+        focus,
+        selected,
+
+        aria,
+        legacy,
+
+        ...htmlAttributes
+    } = props;
+
+    let treeviewLeafClasses = [
+        ownClassName,
+        'k-treeview-leaf',
+        {
+            'k-hover': hover === true,
+            'k-focus': focus === true,
+            'k-selected': selected === true
+        }
+    ];
+
+    let ariaAttr = aria
+        ? {}
+        : {};
+
+    if (legacy) {
+
+        let legacyTreeviewLeafClasses = [
+            ownClassName,
+            'k-in',
+            {
+                'k-state-hover': hover === true,
+                'k-state-focus': focus === true,
+                'k-state-selected': selected === true
+            }
+        ];
+
+        return (
+            <span className={legacyTreeviewLeafClasses} {...ariaAttr} {...htmlAttributes}>
+                {showIcon && <IconStatic name={iconName} />}
+                <span className="k-treeview-leaf-text">{text}</span>
+            </span>
+        );
+    }
+
+    return (
+        <span className={treeviewLeafClasses} {...ariaAttr} {...htmlAttributes}>
+            {showIcon && <IconStatic name={iconName} />}
+            <span className="k-treeview-leaf-text">{text}</span>
+        </span>
+    );
+}
+
+TreeviewLeafStatic.defaultProps = {
+    ...globalDefaultProps,
+
+    text: '',
+
+    showIcon: false,
+    iconName: ''
+};
+
+TreeviewLeafStatic.propTypes = {
+    children: typeof [],
+    className: typeof '',
+
+    text: typeof '',
+
+    showIcon: typeof false,
+    iconName: typeof '',
+
+    hover: typeof false,
+    focus: typeof false,
+    selected: typeof false,
+
+    aria: typeof false,
+    legacy: typeof false,
+
+    htmlAttributes: typeof []
+};
+
+export { TreeviewLeaf, TreeviewLeafStatic };