@progress/kendo-themes-html 4.43.1-dev.4 → 4.43.1-dev.8

package/lib/jsx-runtime.js

@@ -40,7 +40,16 @@ const attrMap = {
     thumbrounded: 'thumbRounded',
 
     // Chip
-    showavatar: 'showAvatar'
+    showavatar: 'showAvatar',
+
+    // Hierarchy
+    haschildren: 'hasChildren',
+
+    // Treeview
+    leafclassname: 'leafClassName',
+
+    // Template
+    contenttemplate: 'contentTemplate'
 };
 
 const booleanAttr = new Set([
@@ -67,12 +76,19 @@ const booleanAttr = new Set([
     'showIcon',
     'showClearButton',
     'showSpinButton',
+    'showArrow',
 
     'showCheckbox',
 
     'virtualization',
     'root',
 
+    'open',
+    'expanded',
+    'hasChildren',
+
+    'showArrow',
+
     'showAvatar',
 
     'aria'
@@ -80,6 +96,7 @@ const booleanAttr = new Set([
 
 const nullAttr = new Set([
     'size',
+    'shape',
     'rounded',
     'fillMode',
     'themeColor',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-themes-html",
   "description": "A collection of HTML helpers used for developing Kendo UI themes",
-  "version": "4.43.1-dev.4",
+  "version": "4.43.1-dev.8",
   "author": "Progress",
   "license": "Apache-2.0",
   "keywords": [
@@ -34,13 +34,13 @@
     "dev": "rollup -cw"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
-    "@babel/preset-react": "^7.16.0",
+    "@babel/core": "^7.16.7",
+    "@babel/preset-env": "^7.16.7",
+    "@babel/preset-react": "^7.16.7",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^21.0.1",
-    "@rollup/plugin-node-resolve": "^13.0.6",
-    "rollup": "^2.59.0"
+    "@rollup/plugin-node-resolve": "^13.1.2",
+    "rollup": "^2.62.0"
   },
-  "gitHead": "f0dfb6acb8fcf7694986e41e4b08d242c4b47add"
+  "gitHead": "cf8448a76498b1f53859522cfa29e66618cdba4c"
 }

package/src/autocomplete/autocomplete.jsx

@@ -75,7 +75,7 @@ function AutocompleteStatic(props) {
             'k-autocomplete',
             {
                 'k-state-hover': hover === true,
-                'k-state-focused': focus === true,
+                'k-state-focus': focus === true,
                 'k-state-invalid': invalid === true,
                 'k-state-required': required === true,
                 'k-state-disabled': disabled === true

package/src/avatar/README.md

@@ -2,7 +2,7 @@
 <!-- default rendering -->
 <div class="k-avatar k-avatar-md k-rounded-circle k-avatar-solid k-avatar-solid-primary">
     <span class="k-avatar-image">
-        <img src="../../assets/avatar.jpg" class="">
+        <img src="../../assets/avatar.jpg" />
     </span>
 </div>
 

package/src/avatar/avatar.jsx

@@ -48,10 +48,7 @@ function AvatarStatic(props) {
             ownClassName,
             'k-avatar',
             `k-avatar-${themeColor}`,
-            {
-                'k-avatar-circle': rounded === 'full',
-                'k-avatar-rounded': rounded !== 'full' && rounded !== null
-            },
+            styles.roundedClass( rounded ),
             styles.sizeClass( size, 'k-avatar' ),
             styles.fillModeClass( fillMode, 'k-avatar' ),
             styles.borderedClass( bordered, 'k-avatar' ),

package/src/button/button.jsx

@@ -6,6 +6,7 @@ class Button extends Component {
 
     init() {
         this._props.text = this.element.innerHTML;
+        this._props.children = [];
     }
 
     render() {
@@ -16,6 +17,7 @@ class Button extends Component {
 function ButtonStatic(props) {
     const {
         className: ownClassName,
+        children,
 
         text,
         type,
@@ -61,22 +63,6 @@ function ButtonStatic(props) {
         }
     ];
 
-    let legacyClasses = [
-        ownClassName,
-        'k-button',
-        {
-            'k-primary': themeColor === 'primary',
-            'k-flat': fillMode === 'flat',
-            'k-outline': fillMode === 'outline',
-            'k-state-hover': hover === true,
-            'k-state-focus': focus === true,
-            'k-state-active': active === true,
-            'k-state-selected': selected === true,
-            'k-state-disabled': disabled === true,
-            'k-icon-button': Boolean( icon) === true && Boolean(text) === false
-        }
-    ];
-
     // Augment attributes
     htmlAttributes.disabled = disabled;
 
@@ -85,18 +71,47 @@ function ButtonStatic(props) {
         : {};
 
     if (legacy) {
+
+        let legacyClasses = [
+            ownClassName,
+            'k-button',
+            styles.fillModeClass( fillMode, 'k-button' ),
+            styles.themeColorClass( fillMode, themeColor, 'k-button' ),
+            {
+                'k-primary': themeColor === 'primary',
+                'k-flat': fillMode === 'flat',
+                'k-outline': fillMode === 'outline',
+                'k-state-hover': hover === true,
+                'k-state-focus': focus === true,
+                'k-state-active': active === true,
+                'k-state-selected': selected === true,
+                'k-state-disabled': disabled === true,
+                'k-icon-button': Boolean( icon) === true && Boolean(text) === false
+            }
+        ];
+
         return (
             <button type={type} className={legacyClasses} {...ariaAttr} {...htmlAttributes}>
-                <IconStatic name={icon} />
-                { text }
+                { children.length === 0
+                    ? <>
+                        <IconStatic className="k-button-icon" name={icon} />
+                        {text && <span className="k-button-text">{text}</span>}
+                    </>
+                    : children
+                }
             </button>
         );
     }
 
     return (
         <button type={type} className={buttonClasses} {...ariaAttr} {...htmlAttributes}>
-            <IconStatic className="k-button-icon" name={icon} />
-            {text && <span className="k-button-text">{text}</span>}
+            { children.length === 0
+                ? <>
+                    <IconStatic className="k-button-icon" name={icon} />
+                    {text && <span className="k-button-text">{text}</span>}
+                </>
+                : children
+            }
         </button>
     );
 }
@@ -104,6 +119,8 @@ function ButtonStatic(props) {
 ButtonStatic.defaultProps = {
     ...globalDefaultProps,
 
+    children: [],
+
     text: '',
     icon: '',
 
@@ -119,6 +136,7 @@ ButtonStatic.defaultProps = {
 };
 
 ButtonStatic.propTypes = {
+    children: typeof [],
     text: typeof '',
     icon: typeof '',
 

package/src/checkbox/checkbox.jsx

@@ -74,12 +74,12 @@ function CheckboxStatic(props) {
         ];
 
         return (
-            <input type="checkbox" className={legacyClasses} {...ariaAttr} {...htmlAttributes} />
+            <span className="k-checkbox-wrap"><input type="checkbox" className={legacyClasses} {...ariaAttr} {...htmlAttributes} /></span>
         );
     }
 
     return (
-        <input type="checkbox" className={checkboxClasses} {...ariaAttr} {...htmlAttributes} />
+        <span className="k-checkbox-wrap"><input type="checkbox" className={checkboxClasses} {...ariaAttr} {...htmlAttributes} /></span>
     );
 }
 

package/src/chip/chip-avatar.jsx

@@ -4,7 +4,7 @@ function ChipAvatarStatic() {
 
     return (
         <AvatarStatic className="k-chip-avatar" type="image">
-            <img src="../../assets/avatar.jpg"/>
+            <img src="../../assets/avatar.jpg" />
         </AvatarStatic>
     );
 

package/src/fab/fab.jsx

@@ -73,11 +73,7 @@ function FabStatic(props) {
             ownClassName,
             'k-fab',
             `k-fab-${themeColor}`,
-            {
-                'k-fab-rectangle': rounded === null,
-                'k-fab-rounded': rounded !== 'full' && rounded !== null,
-                'k-fab-pill': rounded === 'full'
-            },
+            styles.roundedClass( rounded ),
             {
                 'k-state-hover': hover === true,
                 'k-state-focus': focus === true,

package/src/index.js

@@ -38,6 +38,8 @@ export * from './chip/index';
 
 // Native forms
 export * from './button/index';
+export * from './menubutton/index';
+export * from './splitbutton/index';
 export * from './textbox/index';
 export * from './textarea/index';
 export * from './checkbox/index';
@@ -70,7 +72,7 @@ export * from './switch/index';
 // Command interfaces
 // export * from './action-buttons/index';
 export * from './fab/index';
-// export * from './menu/index';
+export * from './menu/index';
 // export * from './toolbar/index';
 
 // Popups and modals
@@ -89,6 +91,7 @@ export * from './fab/index';
 // export * from './pager/index';
 // export * from './stepper/index';
 // export * from './tabstrip/index';
+export * from './treeview/index';
 // export * from './wizard/index';
 
 // Layout & containers

package/src/input/input-inner-span.jsx

@@ -56,7 +56,7 @@ function InputInnerSpanStatic(props) {
             {valueIcon}
             {valueIcon === null && <IconStatic className="k-icon k-input-value-icon" name={valueIconName} />}
             {showValue && value === '' && placeholder}
-            {showValue && value && <span className="k-value-text">{value}</span>}
+            {showValue && value && <span className="k-input-value-text">{value}</span>}
         </span>
     );
 }

package/src/menu/README.md

@@ -0,0 +1,40 @@
+```html
+<!-- default rendering -->
+<ul class="k-group k-menu-group k-reset"></ul>
+
+<!-- canonical rendering -->
+<ul class="
+        k-group k-menu-group k-reset
+        k-menulist-{size}
+    "
+></ul>
+```
+
+```html
+<!-- default rendering -->
+<li class="k-item k-menu-item">
+     <span class="k-link k-menu-link">
+        {icon !== '' && <span class="k-icon k-i-{icon}"></span>}
+        {text !== '' && <span class="k-menu-link-text">Text</span>}
+        <span className="k-menu-expand-arrow k-icon k-i-{arrowIconName || 'none'}"></span>
+     </span>
+</li>
+
+<!-- canonical rendering -->
+<li class="
+    k-item
+    k-menu-item
+    {hover && 'k-hover'}
+    {focus && 'k-focus'}
+    {active && 'k-active'}
+    {disabled && 'k-disabled'}
+" disabled={disabled}>
+     <span class="k-link k-menu-link">
+        {icon !== '' && <span class="k-icon k-i-{icon}"></span>}
+        {text !== '' && <span class="k-menu-link-text">Text</span>}
+        {showArrow && <span className="k-menu-expand-arrow">
+           <span className="k-icon k-i-{arrowIconName || 'none'}"></span>
+        </span>}
+     </span>
+</li>
+```

package/src/menu/index.js

@@ -0,0 +1,3 @@
+export * from './menu-list.jsx';
+export * from './menu-item.jsx';
+export * from './menu-item-content.jsx';

package/src/menu/menu-item-content.jsx

@@ -0,0 +1,48 @@
+import { Component, globalDefaultProps } from '../component/index';
+
+class MenuItemContent extends Component {
+    render() {
+        return <MenuItemContentStatic {...this.props} />;
+    }
+}
+
+function MenuItemContentStatic(props) {
+
+    const {
+        className: ownClassName,
+
+        children,
+
+        ...htmlAttributes
+    } = props;
+
+    let menuItemContentClasses = [
+        ownClassName,
+        'k-menu-item-content'
+    ];
+
+    if (children.length === 0) {
+        return <></>;
+    }
+
+    return (
+        <span className={menuItemContentClasses} {...htmlAttributes}>
+            {children}
+        </span>
+    );
+}
+
+MenuItemContentStatic.defaultProps = {
+    ...globalDefaultProps,
+
+    children: []
+};
+
+MenuItemContentStatic.propTypes = {
+    children: typeof [],
+    className: typeof '',
+
+    htmlAttributes: typeof []
+};
+
+export { MenuItemContent, MenuItemContentStatic };

package/src/menu/menu-item.jsx

@@ -0,0 +1,174 @@
+import { Component, globalDefaultProps } from '../component/index';
+import { IconStatic } from '../icon/index';
+
+class MenuItem extends Component {
+    init() {
+        let subItem = <></>;
+        let contentTemplate = <></>;
+        let children = this._props.children;
+        let newChildren = [];
+
+        children.forEach( child => {
+            let component = child._component;
+
+            if (component === 'MenuItem') {
+                subItem.props.children.push( child );
+                return;
+            }
+
+            if (component === 'MenuItemContent') {
+                contentTemplate.props.children.push( child );
+                return;
+            }
+
+            newChildren.push( child );
+        });
+
+        this._props.subItem = subItem;
+        this._props.contentTemplate = contentTemplate;
+        this._props.children = newChildren;
+    }
+    render() {
+        return <MenuItemStatic {...this.props} />;
+    }
+}
+
+function MenuItemStatic(props) {
+    const {
+        className: ownClassName,
+
+        text,
+
+        icon,
+
+        showArrow,
+        arrowIconName,
+
+        contentTemplate,
+
+        hover,
+        focus,
+        active,
+        selected,
+        disabled,
+
+        dir,
+
+        aria,
+        legacy,
+
+        ...htmlAttributes
+    } = props;
+
+    let menuItemClasses = [
+        ownClassName,
+        'k-item k-menu-item',
+        {
+            'k-disabled': disabled === true
+        }
+    ];
+
+    let menuItemLinkClasses = [
+        'k-link k-menu-link',
+        {
+            'k-hover': hover === true,
+            'k-focus': focus === true,
+            'k-active': active === true,
+            'k-selected': selected === true,
+            'k-disabled': disabled === true
+        }
+    ];
+
+    let expandArrowName = arrowIconName;
+
+    if ( expandArrowName === '' ) {
+        expandArrowName = dir === 'rtl'
+            ? 'arrow-w'
+            : 'arrow-e';
+    }
+
+    // Augment attributes
+    htmlAttributes.disabled = disabled;
+
+    let ariaAttr = aria
+        ? {}
+        : {};
+
+    if (legacy) {
+
+        let legacyMenuItemClasses = [
+            ownClassName,
+            'k-item k-menu-item',
+            {
+                'k-state-hover': hover === true,
+                'k-state-focus': focus === true,
+                'k-state-selected': selected === true,
+                'k-state-disabled': disabled === true,
+            }
+        ];
+
+        return (
+            <li className={legacyMenuItemClasses} {...ariaAttr} {...htmlAttributes}>
+                <span className={`k-link k-menu-link ${active === true ? 'k-state-active' : ''}`}>
+                    {icon && <IconStatic className="k-menu-link-icon" name={icon} />}
+                    <span className="k-menu-link-text">{text}</span>
+                    {showArrow && <span className="k-menu-expand-arrow"><IconStatic name={expandArrowName} /></span>}
+                </span>
+                {contentTemplate}
+            </li>
+        );
+    }
+
+    return (
+        <li className={menuItemClasses} {...ariaAttr} {...htmlAttributes}>
+            <span className={menuItemLinkClasses}>
+                {icon && <IconStatic className="k-menu-link-icon" name={icon} />}
+                <span className="k-menu-link-text">{text}</span>
+                {showArrow && <span className="k-menu-expand-arrow"><IconStatic name={expandArrowName} /></span>}
+            </span>
+            {contentTemplate}
+        </li>
+    );
+}
+
+MenuItemStatic.defaultProps = {
+    ...globalDefaultProps,
+
+    text: '',
+    icon: '',
+
+    className: '',
+    arrowIconName: '',
+
+    size: 'medium',
+
+    dir: 'ltr'
+};
+
+MenuItemStatic.propTypes = {
+    text: typeof '',
+    icon: typeof '',
+
+    showArrow: typeof false,
+    arrowIconName: typeof '',
+
+    contentTemplate: typeof '#fragment',
+
+    size: typeof [ null, 'small', 'medium', 'large' ],
+
+    hover: typeof false,
+    focus: typeof false,
+    active: typeof false,
+    selected: typeof false,
+    disabled: typeof false,
+
+    aria: typeof false,
+    legacy: typeof false,
+
+    dir: typeof '',
+
+    className: typeof '',
+    htmlAttributes: typeof []
+};
+
+export { MenuItem, MenuItemStatic };

package/src/menu/menu-list.jsx

@@ -0,0 +1,74 @@
+import * as styles from '../../utils/styles';
+import { Component, globalDefaultProps } from '../component/index';
+
+class MenuList extends Component {
+    render() {
+        return <MenuListStatic {...this.props} />;
+    }
+}
+
+function MenuListStatic(props) {
+    const {
+        className: ownClassName,
+        children,
+
+        size,
+
+        aria,
+        legacy,
+
+        ...htmlAttributes
+    } = props;
+
+    let menuListClasses = [
+        ownClassName,
+        'k-menu-group',
+        styles.sizeClass( size, 'k-menu-group' ),
+    ];
+
+    let ariaAttr = aria
+        ? {}
+        : {};
+
+    if (legacy) {
+
+        let legacyMenuListClasses = [
+            ownClassName,
+            'k-group k-menu-group k-reset',
+        ];
+
+        return (
+            <ul className={legacyMenuListClasses} {...ariaAttr} {...htmlAttributes}>
+                {children}
+            </ul>
+        );
+    }
+
+    return (
+        <ul className={menuListClasses} {...ariaAttr} {...htmlAttributes}>
+            {children}
+        </ul>
+    );
+}
+
+MenuListStatic.defaultProps = {
+    ...globalDefaultProps,
+
+    className: '',
+
+    size: 'medium'
+};
+
+MenuListStatic.propTypes = {
+    size: typeof [ null, 'small', 'medium', 'large' ],
+
+    children: typeof [],
+
+    aria: typeof false,
+    legacy: typeof false,
+
+    className: typeof '',
+    htmlAttributes: typeof []
+};
+
+export { MenuList, MenuListStatic };