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

package/src/chip/chip.jsx

@@ -1,11 +1,31 @@
 import * as styles from '../../utils/styles';
-import { Component, globalDefaultProps } from '../component';
+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';

package/src/colorpicker/README.md

@@ -1,28 +1,37 @@
 ```html
 <!-- default rendering -->
-<span class="k-combobox k-input k-input-md k-rounded-md k-input-solid">
-    <input type="text" class="k-input-inner" value="..." placeholder="..." />
-    <button type="button" class="k-input-button k-button k-icon-button k-button-md k-button-solid k-button-solid-base">
+<span class="k-colorpicker k-icon-picker k-picker k-picker-md k-rounded-md k-picker-solid">
+    <span class="k-input-inner">
+        <span class="k-value-icon k-color-preview k-no-color">
+            <span class="k-color-preview-mask" style="background-color: red;"></span>
+        </span>
+    </span>
+    <button type="button" class="k-input-button k-button k-button-md k-button-solid k-button-solid-base k-icon-button">
         <span class="k-button-icon k-icon k-i-arrow-s"></span>
     </button>
 </span>
 
 <!-- canonical rendering -->
 <span class="
-    k-combobox
-    k-input
-    k-input-${size}
-    k-rounded-${rounded}
-    k-input-${fillMode}
+    k-colorpicker
+    k-picker
+    k-icon-picker
+    k-picker-{size}
+    k-rounded-{rounded}
+    k-picker-{fillMode}
 
-    ${valid && 'k-valid'}
-    ${invalid && 'k-invalid'}
-    ${required && 'k-required'}
-    ${disabled && 'k-disabled'}
+    {valid && 'k-valid'}
+    {invalid && 'k-invalid'}
+    {required && 'k-required'}
+    {disabled && 'k-disabled'}
 ">
-    <input type={type} class="k-input-inner" value={value} placeholder={placeholder} disabled={disabled} />
-    {valid && <span class="k-input-icon k-icon k-i-check"></span>}
-    {invalid && <span class="k-input-icon k-icon k-i-check"></span>}
+    {inputPrefix && <span class="k-input-prefix">...</span>}
+    <span class="k-input-inner">
+        <span class="k-value-icon k-color-preview k-no-color">
+            <span class="k-color-preview-mask" style={value}></span>
+        </span>
+    </span>
+    {inputSuffix && <span class="k-input-suffix">...</span>}
     <button type="button" class="k-input-button k-button k-icon-button k-button-{size} k-button-{fillMode} k-button-{fillMode}-base">
         <span class="k-button-icon k-icon k-i-arrow-s"></span>
     </button>

package/src/colorpicker/color-preview.jsx

@@ -1,4 +1,4 @@
-import { Component, globalDefaultProps } from '../component';
+import { Component, globalDefaultProps } from '../component/index';
 import { IconStatic } from '../icon/index';
 
 class ColorPreview extends Component {
@@ -39,28 +39,35 @@ function ColorPreviewStatic(props) {
 
     if (legacy) {
 
-        let legacyClasses = [
-            ownClassName,
-            'k-selected-color',
-            {
-                'k-no-color': color === ''
-            }
-        ];
-
-        let legacyStyles = {
-            'background-color': color
-        };
-
-        if (iconName === '') {
-            return (
-                <span className={legacyClasses} style={legacyStyles}></span>
-            );
-        }
+        // let legacyClasses = [
+        //     ownClassName,
+        //     'k-selected-color',
+        //     {
+        //         'k-no-color': color === ''
+        //     }
+        // ];
+
+        // let legacyStyles = {
+        //     'background-color': color
+        // };
+
+        // if (iconName === '') {
+        //     return (
+        //         <span className={legacyClasses} style={legacyStyles}></span>
+        //     );
+        // }
+
+        // return (
+        //     <IconStatic className="k-tool-icon" name={iconName}>
+        //         <span className={legacyClasses} style={legacyStyles}></span>
+        //     </IconStatic>
+        // );
 
         return (
-            <IconStatic className="k-tool-icon" name={iconName}>
-                <span className={legacyClasses} style={legacyStyles}></span>
-            </IconStatic>
+            <span className={colorPreviewClasses} {...ariaAttr} {...htmlAttributes}>
+                {iconName && <IconStatic name={iconName} className="k-color-preview-icon" />}
+                <span className="k-color-preview-mask" style={styles}></span>
+            </span>
         );
 
     }

package/src/colorpicker/colorpicker.jsx

@@ -1,4 +1,4 @@
-import { globalDefaultProps } from '../component';
+import { globalDefaultProps } from '../component/index';
 import { Picker, PickerStatic, InputInnerSpanStatic } from '../input/index';
 import { ColorPreviewStatic } from './color-preview.jsx';
 import { ButtonStatic } from '../button/index';
@@ -67,17 +67,15 @@ function ColorpickerStatic(props) {
             'k-widget',
             'k-colorpicker',
             {
+                '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 (
@@ -133,7 +131,7 @@ ColorpickerStatic.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/combobox/combobox.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 ComboboxStatic(props) {
             'k-widget',
             'k-combobox',
             {
+                'k-state-hover': hover === true,
+                'k-state-focus': focus === true,
+                'k-state-invalid': invalid === true,
                 'k-state-disabled': disabled === true
             }
         ];
 
         let legacyWrapClasses = [
-            'k-dropdown-wrap',
-            {
-                'k-state-hover': hover === true,
-                'k-state-focused': focus === true,
-                'k-state-invalid': invalid === true
-            }
+            'k-dropdown-wrap'
         ];
 
         return (
@@ -150,7 +148,7 @@ ComboboxStatic.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/{component.js → component/component.jsx}

@@ -1,9 +1,11 @@
-import { isFunction } from '../utils/object';
-import { renderDOM, htmlToProps } from '../lib/jsx-runtime';
+import { isFunction } from '../../utils/object';
+import { renderDOM, htmlToProps } from '../../lib/jsx-runtime';
 
 const globalDefaultProps = {
     legacy: false,
 
+    framework: 'universal',
+
     className: '',
 
     aria: false,

package/src/component/index.js

@@ -0,0 +1 @@
+export * from './component.jsx';

package/src/dateinput/dateinput.jsx

@@ -1,4 +1,4 @@
-import { Component, globalDefaultProps } from '../component';
+import { Component, globalDefaultProps } from '../component/index';
 import { InputStatic, InputInnerInputStatic } from '../input/index';
 import { InputValidationIconStatic, InputLoadingIconStatic, InputClearValueStatic } from '../input/index';
 import { SpinButtonStatic } from '../spinbutton/index';
@@ -75,17 +75,15 @@ function DateInputStatic(props) {
             'k-widget',
             'k-dateinput',
             {
+                'k-state-hover': hover === true,
+                'k-state-focus': focus === true,
+                'k-state-invalid': invalid === true,
                 'k-state-disabled': disabled === true
             }
         ];
 
         let legacyWrapClasses = [
-            'k-dateinput-wrap',
-            {
-                'k-state-hover': hover === true,
-                'k-state-focused': focus === true,
-                'k-state-invalid': invalid === true
-            }
+            'k-dateinput-wrap'
         ];
 
         let legacyInputClasses = [
@@ -148,7 +146,7 @@ DateInputStatic.propTypes = {
     showClearButton: typeof true,
 
     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/datepicker/datepicker.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 DatePickerStatic(props) {
             'k-widget',
             'k-datepicker',
             {
+                '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 @@ DatePickerStatic.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/datetimepicker/datetimepicker.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 DateTimePickerStatic(props) {
             'k-widget',
             'k-datetimepicker',
             {
+                '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 @@ DateTimePickerStatic.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/dropdownlist/dropdownlist.jsx

@@ -1,4 +1,4 @@
-import { globalDefaultProps } from '../component';
+import { globalDefaultProps } from '../component/index';
 import { Picker, PickerStatic, InputInnerSpanStatic } from '../input/index';
 import { InputValidationIconStatic, InputLoadingIconStatic, InputClearValueStatic } from '../input/index';
 import { ButtonStatic } from '../button/index';
@@ -88,17 +88,15 @@ function DropdownListStatic(props) {
             'k-widget',
             'k-dropdown',
             {
+                'k-state-hover': hover === true,
+                'k-state-focus': focus === true,
+                'k-state-invalid': invalid === true,
                 'k-state-disabled': disabled === true
             }
         ];
 
         let legacyWrapClasses = [
-            'k-dropdown-wrap',
-            {
-                'k-state-hover': hover === true,
-                'k-state-focused': focus === true,
-                'k-state-invalid': invalid === true
-            }
+            'k-dropdown-wrap'
         ];
 
         return (
@@ -172,7 +170,7 @@ DropdownListStatic.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/fab/README.md

@@ -0,0 +1,19 @@
+```html
+<!-- default rendering -->
+<button type="button" class="k-fab k-fab-rectangle k-fab-md k-rounded-full k-fab-solid k-fab-solid-primary">
+    <span class="k-fab-icon k-icon k-i-plus"></span>
+    <span class="k-fab-text">Create</span>
+</button>
+
+<!-- canonical rendering -->
+<button class="
+    k-fab
+    k-fab-{size}
+    k-fab-{rounded}
+    k-fab-{fillMode}
+    k-fab-{fillMode}-{themeColor}
+">
+    {icon !== '' && <span class="k-fab-icon k-icon k-i-{icon}"></span>}
+    {text !== '' && <span class="k-fab-text">{text}</span>}
+</button>
+```