@progress/kendo-themes-html 5.0.0-beta.1 → 5.0.0-beta.5

package/lib/jsx-runtime.js

@@ -39,13 +39,17 @@ const attrMap = {
     trackrounded: 'trackRounded',
     thumbrounded: 'thumbRounded',
 
-    // Menu list
-    contenttemplate: 'contentTemplate',
-
     // Chip
-    showremoveicon: 'showRemoveIcon',
-    showselectedicon: 'showSelectedIcon',
-    showavatar: 'showAvatar'
+    showavatar: 'showAvatar',
+
+    // Hierarchy
+    haschildren: 'hasChildren',
+
+    // Treeview
+    leafclassname: 'leafClassName',
+
+    // Template
+    contenttemplate: 'contentTemplate'
 };
 
 const booleanAttr = new Set([
@@ -79,8 +83,12 @@ const booleanAttr = new Set([
     'virtualization',
     'root',
 
-    'showRemoveIcon',
-    'showSelectedIcon',
+    'open',
+    'expanded',
+    'hasChildren',
+
+    'showArrow',
+
     'showAvatar',
 
     'aria'

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": "5.0.0-beta.1",
+  "version": "5.0.0-beta.5",
   "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": "5f6c640b397e7dfb0481ea1eecd8fbce7abb967f"
+  "gitHead": "f9a49055787d0553b82bdf0782b3a78e0fb58139"
 }

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
@@ -139,7 +139,7 @@ AutocompleteStatic.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/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

@@ -16,7 +16,6 @@ function AvatarStatic(props) {
         type,
 
         size,
-        shape,
         rounded,
         bordered,
 
@@ -35,29 +34,26 @@ function AvatarStatic(props) {
         styles.sizeClass( size, 'k-avatar' ),
         styles.roundedClass( rounded ),
         styles.fillModeClass( fillMode, 'k-avatar' ),
-        styles.shapeClass( shape, 'k-avatar' ),
         styles.themeColorClass( fillMode, themeColor, 'k-avatar' ),
         styles.borderedClass( bordered, 'k-avatar' ),
     ];
 
-    let legacyClasses = [
-        ownClassName,
-        'k-avatar',
-        `k-avatar-${themeColor}`,
-        {
-            'k-avatar-circle': rounded === 'circle',
-            'k-avatar-rounded': rounded !== 'circle' && rounded !== null
-        },
-        styles.sizeClass( size, 'k-avatar' ),
-        styles.fillModeClass( fillMode, 'k-avatar' ),
-        styles.borderedClass( bordered, 'k-avatar' ),
-    ];
-
     let ariaAttr = aria
         ? {}
         : {};
 
     if (legacy) {
+
+        let legacyClasses = [
+            ownClassName,
+            'k-avatar',
+            `k-avatar-${themeColor}`,
+            styles.roundedClass( rounded ),
+            styles.sizeClass( size, 'k-avatar' ),
+            styles.fillModeClass( fillMode, 'k-avatar' ),
+            styles.borderedClass( bordered, 'k-avatar' ),
+        ];
+
         return (
             <span className={legacyClasses} {...ariaAttr} {...htmlAttributes}>
                 <span className={`k-avatar-${type}`}>
@@ -85,8 +81,7 @@ AvatarStatic.defaultProps = {
     type: '',
 
     size: 'medium',
-    shape: 'square',
-    rounded: 'circle',
+    rounded: 'full',
     bordered: false,
 
     fillMode: 'solid',
@@ -99,9 +94,8 @@ AvatarStatic.propTypes = {
 
     type: typeof '',
 
-    size: typeof [ null, 'small', 'medium', 'large', 'circle' ],
-    shape: typeof [ null, 'square', 'circle', 'rounded' ],
-    rounded: typeof [ null, '0', 'small', 'medium', 'large' ],
+    size: typeof [ null, 'small', 'medium', 'large' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'full' ],
     bordered: typeof false,
 
     fillMode: typeof [ null, 'solid', 'outline' ],

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,13 +136,14 @@ ButtonStatic.defaultProps = {
 };
 
 ButtonStatic.propTypes = {
+    children: typeof [],
     text: typeof '',
     icon: typeof '',
 
     type: typeof [ 'button', 'submit', 'reset' ],
 
     size: typeof [ null, 'small', 'medium', 'large' ],
-    rounded: typeof [ null, '0', 'small', 'medium', 'large', 'pill', 'circle' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'full' ],
     shape: typeof [ null, 'rectangle', 'square' ],
 
     fillMode: typeof [ null, 'solid', 'flat', 'outline', 'link' ],

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/README.md

@@ -2,7 +2,7 @@
 
 ```html
 <!-- default rendering -->
-<div class="k-chip k-chip-md k-rounded-pill k-chip-solid k-chip-solid-base">
+<div class="k-chip k-chip-md k-rounded-full k-chip-solid k-chip-solid-base">
     <span class="k-chip-text">Chip Text</span>
 </div>
 
@@ -32,9 +32,9 @@
 ```html
 <!-- default rendering -->
 <div class="k-chip-list k-chip-list-md">
-    <div class="k-chip k-chip-md k-rounded-pill k-chip-solid k-chip-solid-base">...</div>
-    <div class="k-chip k-chip-md k-rounded-pill k-chip-solid k-chip-solid-base">...</div>
-    <div class="k-chip k-chip-md k-rounded-pill k-chip-solid k-chip-solid-base">...</div>
+    <div class="k-chip k-chip-md k-rounded-full k-chip-solid k-chip-solid-base">...</div>
+    <div class="k-chip k-chip-md k-rounded-full k-chip-solid k-chip-solid-base">...</div>
+    <div class="k-chip k-chip-md k-rounded-full k-chip-solid k-chip-solid-base">...</div>
 </div>
 
 <!-- canonical rendering -->
@@ -44,4 +44,4 @@
         <div class="k-chip" {...props}>...</div>
         <div class="k-chip" {...props}>...</div>
 </div>
-```
+```

package/src/chip/chip-actions.jsx

@@ -0,0 +1,80 @@
+import { Component, globalDefaultProps } from '../component/index';
+import { IconStatic } from '../icon/index';
+
+function transformActions(actions) {
+    let newActions = [];
+
+    actions.forEach(action => {
+        if (action === 'more') {
+            newActions.push(
+                <span className="k-chip-action k-chip-more-action">
+                    <IconStatic name="more-vertical" />
+                </span>
+            );
+
+            return;
+        }
+
+        if (action === 'remove') {
+            newActions.push(
+                <span className="k-chip-action k-chip-remove-action">
+                    <IconStatic name="x-circle" />
+                </span>
+            );
+
+            return;
+        }
+
+        newActions.push(
+            <span className={`k-chip-action k-chip-${action}-action`}>
+                <IconStatic name={action} />
+            </span>
+        );
+    });
+
+    return newActions;
+}
+
+class ChipActions extends Component {
+    render() {
+        return <ChipActionsStatic {...this.props} />;
+    }
+}
+
+function ChipActionsStatic(props) {
+
+    const {
+        actions
+    } = props;
+
+    if (actions.length === 0) {
+        return <></>;
+    }
+
+    return (
+        <span className="k-chip-actions">
+            {transformActions( actions )}
+        </span>
+    );
+
+}
+
+ChipActionsStatic.defaultProps = {
+    ...globalDefaultProps,
+
+    actions: []
+};
+
+ChipActionsStatic.propTypes = {
+    className: typeof '',
+    children: typeof [],
+
+    actions: typeof [],
+
+    aria: typeof false,
+    legacy: typeof false,
+
+    htmlAttributes: typeof []
+};
+
+export { ChipActions, ChipActionsStatic };

package/src/chip/chip-avatar.jsx

@@ -1,18 +1,10 @@
 import { AvatarStatic } from '../avatar/index';
 
-function ChipAvatarStatic(chipProps) {
-
-    const {
-        showAvatar
-    } = chipProps;
-
-    if (!showAvatar) {
-        return <></>;
-    }
+function ChipAvatarStatic() {
 
     return (
         <AvatarStatic className="k-chip-avatar" type="image">
-            <img src="../../assets/avatar.jpg"/>
+            <img src="../../assets/avatar.jpg" />
         </AvatarStatic>
     );
 

package/src/chip/chip-list.jsx

@@ -12,6 +12,8 @@ function ChipListStatic(props) {
     const {
         className: ownClassName,
 
+        children,
+
         size,
 
         selection,
@@ -35,6 +37,7 @@ function ChipListStatic(props) {
 
     let legacyListClasses = [
         ownClassName,
+        'k-chip-list'
     ];
 
     let ariaAttr = aria
@@ -44,14 +47,14 @@ function ChipListStatic(props) {
     if (legacy) {
         return (
             <div className={legacyListClasses} {...ariaAttr} {...htmlAttributes}>
-
+                {children}
             </div>
         );
     }
 
     return (
         <div className={listClasses} {...ariaAttr} {...htmlAttributes}>
-
+            {children}
         </div>
     );
 }
@@ -59,14 +62,15 @@ function ChipListStatic(props) {
 ChipListStatic.defaultProps = {
     ...globalDefaultProps,
 
-    className: '',
-
     size: 'medium',
 
     selection: 'none'
 };
 
 ChipListStatic.propTypes = {
+    className: typeof '',
+    children: typeof [],
+
     size: typeof [ null, 'small', 'medium', 'large' ],
 
     selection: typeof [ null, 'single', 'multiple' ],
@@ -74,7 +78,6 @@ ChipListStatic.propTypes = {
     aria: typeof false,
     legacy: typeof false,
 
-    className: typeof '',
     htmlAttributes: typeof []
 };
 

package/src/chip/chip.jsx

@@ -1,11 +1,31 @@
 import * as styles from '../../utils/styles';
 import { Component, globalDefaultProps } from '../component/index';
 import { IconStatic } from '../icon/index';
-import { ChipSelectedIconStatic } from '../chip/index';
-import { ChipRemoveIconStatic } from '../chip/index';
-import { ChipAvatarStatic } from '../chip/index';
+import { ChipAvatarStatic } from './chip-avatar.jsx';
+import { ChipActionsStatic } from './chip-actions.jsx';
 
 class Chip extends Component {
+
+    init() {
+        let actions = this._props.actions;
+        let newActions = [];
+
+        if (actions === undefined) {
+            this._props.actions = [];
+            return;
+        }
+
+        if (Array.isArray(actions)) {
+            return;
+        }
+
+        actions.split(',').forEach(action => {
+            newActions.push(action.trim());
+        });
+
+        this._props.actions = newActions;
+    }
+
     render() {
         return <ChipStatic {...this.props} />;
     }
@@ -18,6 +38,10 @@ function ChipStatic(props) {
         children,
 
         text,
+        icon,
+        actions,
+
+        showAvatar,
 
         size,
         rounded,
@@ -25,9 +49,6 @@ function ChipStatic(props) {
         fillMode,
         themeColor,
 
-        icon,
-        showAvatar,
-
         hover,
         focus,
         active,
@@ -48,7 +69,6 @@ function ChipStatic(props) {
         styles.fillModeClass( fillMode, 'k-chip' ),
         styles.themeColorClass( fillMode, themeColor, 'k-chip' ),
         {
-            'k-chip-has-icon': icon !== '' || showAvatar,
             'k-hover': hover === true,
             'k-focus': focus === true,
             'k-active': active === true,
@@ -57,21 +77,6 @@ function ChipStatic(props) {
         }
     ];
 
-    let legacyClasses = [
-        ownClassName,
-        'k-chip',
-        {
-            'k-chip-has-icon': icon !== '' || showAvatar,
-            'k-chip-outline': fillMode === 'outline',
-            'k-chip-solid': fillMode === 'solid',
-            '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
-        }
-    ];
-
     // Augment attributes
     htmlAttributes.disabled = disabled;
 
@@ -80,18 +85,33 @@ function ChipStatic(props) {
         : {};
 
     if (legacy) {
+
+        let legacyClasses = [
+            ownClassName,
+            'k-chip',
+            `k-chip-${themeColor}`,
+            {
+                'k-chip-outline': fillMode === 'outline',
+                'k-chip-solid': fillMode === 'solid',
+                '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
+            }
+        ];
+
         return (
             <div className={legacyClasses} {...ariaAttr} {...htmlAttributes}>
                 <IconStatic className="k-chip-icon" name={icon} />
-                <ChipSelectedIconStatic {...props} />
-                <ChipAvatarStatic {...props} />
+                {showAvatar && <ChipAvatarStatic {...props} />}
                 <span className="k-chip-content">
                     { children.length
                         ? children
-                        : text &&
-                        <span className="k-chip-label">{text}</span>}
+                        : text && <span className="k-chip-label">{text}</span>
+                    }
                 </span>
-                <ChipRemoveIconStatic {...props} />
+                { actions.length > 0 && <ChipActionsStatic actions={actions} />}
             </div>
         );
     }
@@ -99,15 +119,14 @@ function ChipStatic(props) {
     return (
         <div className={chipClasses} {...ariaAttr} {...htmlAttributes}>
             <IconStatic className="k-chip-icon" name={icon} />
-            <ChipSelectedIconStatic {...props} />
-            <ChipAvatarStatic {...props} />
+            {showAvatar && <ChipAvatarStatic {...props} />}
             <span className="k-chip-content">
                 { children.length
                     ? children
-                    : text &&
-                    <span className="k-chip-label k-text-ellipsis">{text}</span>}
+                    : text && <span className="k-chip-label k-text-ellipsis">{text}</span>
+                }
             </span>
-            <ChipRemoveIconStatic {...props} />
+            { actions.length > 0 && <ChipActionsStatic actions={actions} />}
         </div>
     );
 }
@@ -119,9 +138,8 @@ ChipStatic.defaultProps = {
 
     text: '',
     icon: '',
-    showRemoveIcon: false,
+    actions: [],
     showAvatar: false,
-    showSelectedIcon: false,
 
     className: '',
 
@@ -133,16 +151,16 @@ ChipStatic.defaultProps = {
 };
 
 ChipStatic.propTypes = {
+    className: typeof '',
     children: typeof [],
 
     text: typeof '',
     icon: typeof '',
-    showRemoveIcon: typeof false,
+    actions: typeof [],
     showAvatar: typeof false,
-    showSelectedIcon: typeof false,
 
     size: typeof [ null, 'small', 'medium', 'large' ],
-    rounded: typeof [ null, '0', 'small', 'medium', 'large', 'pill' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'full' ],
 
     fillMode: typeof [ null, 'solid', 'outline' ],
     themeColor: typeof [ null, 'base', 'error', 'warning', 'info', 'success' ],
@@ -156,7 +174,6 @@ ChipStatic.propTypes = {
     aria: typeof false,
     legacy: typeof false,
 
-    className: typeof '',
     htmlAttributes: typeof []
 };
 

package/src/chip/index.js

@@ -1,5 +1,4 @@
-export * from './chip-selected-icon.jsx';
-export * from './chip-remove-icon.jsx';
-export * from './chip-avatar.jsx';
 export * from './chip.jsx';
+export * from './chip-avatar.jsx';
+export * from './chip-actions.jsx';
 export * from './chip-list.jsx';