@progress/kendo-themes-html 4.42.1-dev.3 → 4.43.1-dev.1

package/lib/jsx-runtime.js

@@ -31,6 +31,8 @@ const attrMap = {
     showclearbutton: 'showClearButton',
     clearbutton: 'clearButton',
 
+    showcheckbox: 'showCheckbox',
+
     // Switch
     onlabel: 'onLabel',
     offlabel: 'offLabel',
@@ -63,9 +65,24 @@ const booleanAttr = new Set([
     'showClearButton',
     'showSpinButton',
 
+    'showCheckbox',
+
+    'virtualization',
+    'root',
+
     'aria'
 ]);
 
+const nullAttr = new Set([
+    'size',
+    'rounded',
+    'fillMode',
+    'themeColor',
+
+    'trackRounded',
+    'thumbRounded'
+]);
+
 const skipAttr = new Set([
     'is',
     'aria',
@@ -144,6 +161,10 @@ function attrToProps( attributes ) {
             attrName = attrMap[attrName];
         }
 
+        // Set props as is
+        props[ attrName ] = attrValue;
+
+        // Ensure boolean value
         if (booleanAttr.has(attrName) && typeof attrValue === 'string') {
             switch (attrValue) {
                 case '':
@@ -154,8 +175,11 @@ function attrToProps( attributes ) {
                     props[ attrName ] = false;
                     break;
             }
-        } else {
-            props[ attrName ] = attrValue;
+        }
+
+        // Ensure null value
+        if (nullAttr.has(attrName) && attrValue === 'null') {
+            props[ attrName ] = null;
         }
     });
 

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.42.1-dev.3",
+  "version": "4.43.1-dev.1",
   "author": "Progress",
   "license": "Apache-2.0",
   "keywords": [
@@ -42,5 +42,5 @@
     "@rollup/plugin-node-resolve": "^13.0.6",
     "rollup": "^2.59.0"
   },
-  "gitHead": "39ad5cd911f1a5d7a041e0929f0dcd04339e4f64"
+  "gitHead": "9dcefebd634a5d866712324f22b0e903deaf7158"
 }

package/src/autocomplete/README.md

@@ -8,17 +8,23 @@
 <span class="
     k-autocomplete
     k-input
-    k-input-${size}
-    k-rounded-${rounded}
-    k-input-${fillMode}
+    k-input-{size}
+    k-rounded-{rounded}
+    k-input-{fillMode}
 
-    ${valid && 'k-valid'}
-    ${invalid && 'k-invalid'}
-    ${required && 'k-required'}
-    ${disabled && 'k-disabled'}
+    {valid && 'k-valid'}
+    {invalid && 'k-invalid'}
+    {loading && 'k-loading'}
+    {required && 'k-required'}
+    {disabled && 'k-disabled'}
 ">
+    {showInputIcon && inputIconName !== '' && <span class="k-input-icon k-i-icon k-i-{inputIconName}"></span>}
+    {inputPrefix && <span class="k-input-prefix">...</span>}
     <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-suffix">...</span>}
+    {showValidationIcon && valid && <span class="k-validation-icon k-icon k-i-check"></span>}
+    {showValidationIcon && invalid && <span class="k-validation-icon k-icon k-i-warning"></span>}
+    {showLoadingIcon && loading && <span class="k-icon k-i-loading"></span>}
+    {showClearValue && text !== '' && <span class="k-clear-value"><span class="k-icon k-i-x"></span></span>}
 </span>
 ```

package/src/autocomplete/autocomplete.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';
 
@@ -138,10 +138,10 @@ AutocompleteStatic.propTypes = {
     prefix: typeof '#fragment',
     suffix: typeof '#fragment',
 
-    size: typeof [ 'none', 'small', 'medium', 'large' ],
-    rounded: typeof [ 'none', 'small', 'medium', 'large', 'pill' ],
+    size: typeof [ null, 'small', 'medium', 'large' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'pill' ],
 
-    fillMode: typeof [ 'none', 'solid', 'flat', 'outline' ],
+    fillMode: typeof [ null, 'solid', 'flat', 'outline' ],
 
     hover: typeof false,
     focus: typeof false,

package/src/avatar/README.md

@@ -0,0 +1,21 @@
+```html
+<!-- 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="">
+    </span>
+</div>
+
+<!-- canonical rendering -->
+<div class="
+    k-avatar
+    k-avatar-{size}
+    k-rounded-{rounded}
+    k-avatar-{fillMode}
+    k-avatar-{fillMode}-{themeColor}
+">
+    <span class="k-avatar-{type}">
+        {content}
+    </span>
+</div>
+```

package/src/avatar/avatar.jsx

@@ -0,0 +1,116 @@
+import * as styles from '../../utils/styles';
+import { Component, globalDefaultProps } from '../component/index';
+
+class Avatar extends Component {
+    render() {
+        return <AvatarStatic {...this.props} />;
+    }
+}
+
+function AvatarStatic(props) {
+    const {
+        className: ownClassName,
+
+        children,
+
+        type,
+
+        size,
+        shape,
+        rounded,
+        bordered,
+
+        fillMode,
+        themeColor,
+
+        aria,
+        legacy,
+
+        ...htmlAttributes
+    } = props;
+
+    let avatarClasses = [
+        ownClassName,
+        'k-avatar',
+        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) {
+        return (
+            <span className={legacyClasses} {...ariaAttr} {...htmlAttributes}>
+                <span className={`k-avatar-${type}`}>
+                    {children}
+                </span>
+            </span>
+        );
+    }
+
+    return (
+        <span className={avatarClasses} {...ariaAttr} {...htmlAttributes}>
+            <span className={`k-avatar-${type}`}>
+                {children}
+            </span>
+        </span>
+    );
+}
+
+AvatarStatic.defaultProps = {
+    ...globalDefaultProps,
+
+    className: '',
+    children: [],
+
+    type: '',
+
+    size: 'medium',
+    shape: 'square',
+    rounded: 'circle',
+    bordered: false,
+
+    fillMode: 'solid',
+    themeColor: 'primary'
+};
+
+AvatarStatic.propTypes = {
+    className: typeof '',
+    children: typeof [],
+
+    type: typeof '',
+
+    size: typeof [ null, 'small', 'medium', 'large', 'circle' ],
+    shape: typeof [ null, 'square', 'circle', 'rounded' ],
+    rounded: typeof [ null, '0', 'small', 'medium', 'large' ],
+    bordered: typeof false,
+
+    fillMode: typeof [ null, 'solid', 'outline' ],
+    themeColor: typeof [ null, 'primary' ],
+
+    aria: typeof false,
+    legacy: typeof false,
+
+    htmlAttributes: typeof []
+};
+
+export { Avatar, AvatarStatic };

package/src/avatar/index.js

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

package/src/button/README.md

@@ -7,16 +7,16 @@
 <!-- canonical rendering -->
 <button class="
     k-button
-    ${text === '' && icon !== '' && 'k-icon-button'}
-    k-button-${size}
-    k-button-${shape}
-    k-rounded-${rounded}
-    k-button-${fillMode}
-    k-button-${fillMode}-${themeColor}
+    {text === '' && iconName !== '' && 'k-icon-button'}
+    k-button-{size}
+    k-button-{shape}
+    k-rounded-{rounded}
+    k-button-{fillMode}
+    k-button-{fillMode}-{themeColor}
 
-    ${disabled && 'k-disabled'}
+    {disabled && 'k-disabled'}
 " type={type} disabled={disabled}>
-    {icon !== '' && <span class="k-button-icon k-icon k-i-${icon}"></span>}
+    {iconName !== '' && <span class="k-button-icon k-icon k-i-{iconName}"></span>}
     {text !== '' && <span class="k-button-text">Button</span>}
 </button>
 ```

package/src/button/button.jsx

@@ -1,5 +1,5 @@
 import * as styles from '../../utils/styles';
-import { Component, globalDefaultProps } from '../component';
+import { Component, globalDefaultProps } from '../component/index';
 import { IconStatic } from '../icon/index';
 
 class Button extends Component {
@@ -124,12 +124,12 @@ ButtonStatic.propTypes = {
 
     type: typeof [ 'button', 'submit', 'reset' ],
 
-    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, '0', 'small', 'medium', 'large', 'pill', 'circle' ],
+    shape: typeof [ null, 'rectangle', 'square' ],
 
-    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/checkbox/README.md

@@ -6,16 +6,16 @@
 <input type="checkbox"
     class="
         k-checkbox
-        k-checkbox-${size}
-        k-rounded-${rounded}
+        k-checkbox-{size}
+        k-rounded-{rounded}
 
-        ${checked && 'k-checked'}
-        ${indeterminate && 'k-indeterminate'}
+        {checked && 'k-checked'}
+        {indeterminate && 'k-indeterminate'}
 
-        ${valid && 'k-valid'}
-        ${invalid && 'k-invalid'}
-        ${required && 'k-required'}
-        ${disabled && 'k-disabled'}
+        {valid && 'k-valid'}
+        {invalid && 'k-invalid'}
+        {required && 'k-required'}
+        {disabled && 'k-disabled'}
     "
     disabled={disabled}
 />

package/src/checkbox/checkbox.jsx

@@ -1,5 +1,5 @@
 import * as styles from '../../utils/styles';
-import { Component, globalDefaultProps } from '../component';
+import { Component, globalDefaultProps } from '../component/index';
 
 class Checkbox extends Component {
     render() {
@@ -103,8 +103,8 @@ CheckboxStatic.propTypes = {
     checked: typeof false,
     indeterminate: typeof false,
 
-    size: typeof [ 'none', 'small', 'medium', 'large' ],
-    rounded: typeof [ 'none', 'small', 'medium', 'large' ],
+    size: typeof [ null, 'small', 'medium', 'large' ],
+    rounded: typeof [ null, 'small', 'medium', 'large' ],
 
     hover: typeof false,
     focus: typeof false,

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 {
@@ -29,6 +29,10 @@ function ColorPreviewStatic(props) {
         }
     ];
 
+    let styles = {
+        'background-color': color
+    };
+
     let ariaAttr = aria
         ? {}
         : {};
@@ -64,7 +68,7 @@ function ColorPreviewStatic(props) {
     return (
         <span className={colorPreviewClasses} {...ariaAttr} {...htmlAttributes}>
             {iconName && <IconStatic name={iconName} className="k-color-preview-icon" />}
-            <span className="k-color-preview-mask"></span>
+            <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';
@@ -52,7 +52,8 @@ function ColorpickerStatic(props) {
 
     let colorpickerClasses = [
         ownClassName,
-        'k-colorpicker'
+        'k-colorpicker',
+        'k-icon-picker'
     ];
 
     let ariaAttr = aria
@@ -92,9 +93,9 @@ function ColorpickerStatic(props) {
     return (
         <PickerStatic className={colorpickerClasses} {...ariaAttr} {...htmlAttributes}>
             {prefix}
-            <InputInnerSpanStatic showValue={false} valueIcon={<ColorPreviewStatic className="k-icon k-value-icon" color={value} iconName={iconName} />} />
+            <InputInnerSpanStatic showValue={false} valueIcon={<ColorPreviewStatic className="k-value-icon" color={value} iconName={iconName} />} />
             {suffix}
-            <ButtonStatic className="k-input-button" icon="arrow-s" rounded="none" size={size} fillMode={fillMode}></ButtonStatic>
+            <ButtonStatic className="k-input-button" icon="arrow-s" shape={null} rounded={null} size={size} fillMode={fillMode}></ButtonStatic>
         </PickerStatic>
     );
 }
@@ -131,10 +132,10 @@ ColorpickerStatic.propTypes = {
     prefix: typeof '#fragment',
     suffix: typeof '#fragment',
 
-    size: typeof [ 'none', 'small', 'medium', 'large' ],
-    rounded: typeof [ 'none', 'small', 'medium', 'large', 'pill' ],
+    size: typeof [ null, 'small', 'medium', 'large' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'pill' ],
 
-    fillMode: typeof [ 'none', 'solid', 'flat', 'outline' ],
+    fillMode: typeof [ null, 'solid', 'flat', 'outline' ],
 
     hover: typeof false,
     focus: typeof false,

package/src/combobox/README.md

@@ -11,18 +11,24 @@
 <span class="
     k-combobox
     k-input
-    k-input-${size}
-    k-rounded-${rounded}
-    k-input-${fillMode}
+    k-input-{size}
+    k-rounded-{rounded}
+    k-input-{fillMode}
 
-    ${valid && 'k-valid'}
-    ${invalid && 'k-invalid'}
-    ${required && 'k-required'}
-    ${disabled && 'k-disabled'}
+    {valid && 'k-valid'}
+    {invalid && 'k-invalid'}
+    {loading && 'k-loading'}
+    {required && 'k-required'}
+    {disabled && 'k-disabled'}
 ">
+    {showInputIcon && inputIconName !== '' && <span class="k-input-icon k-i-icon k-i-{inputIconName}"></span>}
+    {inputPrefix && <span class="k-input-prefix">...</span>}
     <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-suffix">...</span>}
+    {showValidationIcon && valid && <span class="k-validation-icon k-icon k-i-check"></span>}
+    {showValidationIcon && invalid && <span class="k-validation-icon k-icon k-i-warning"></span>}
+    {showLoadingIcon && loading && <span class="k-icon k-i-loading"></span>}
+    {showClearValue && text !== '' && <span class="k-clear-value"><span class="k-icon k-i-x"></span></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/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';
@@ -110,7 +110,7 @@ function ComboboxStatic(props) {
             <InputValidationIconStatic {...props} />
             <InputLoadingIconStatic {...props} />
             <InputClearValueStatic {...props} />
-            <ButtonStatic className="k-input-button" icon="arrow-s" rounded="none" size={size} fillMode={fillMode}></ButtonStatic>
+            <ButtonStatic className="k-input-button" icon="arrow-s" shape={null} rounded={null} size={size} fillMode={fillMode}></ButtonStatic>
         </InputStatic>
     );
 }
@@ -149,10 +149,10 @@ ComboboxStatic.propTypes = {
     prefix: typeof '#fragment',
     suffix: typeof '#fragment',
 
-    size: typeof [ 'none', 'small', 'medium', 'large' ],
-    rounded: typeof [ 'none', 'small', 'medium', 'large', 'pill' ],
+    size: typeof [ null, 'small', 'medium', 'large' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'pill' ],
 
-    fillMode: typeof [ 'none', 'solid', 'flat', 'outline' ],
+    fillMode: typeof [ null, 'solid', 'flat', 'outline' ],
 
     hover: typeof false,
     focus: typeof false,

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: true,
 
+    framework: 'universal',
+
     className: '',
 
     aria: false,

package/src/component/index.js

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

package/src/dateinput/README.md

@@ -16,18 +16,24 @@
 <span class="
     k-dateinput
     k-input
-    k-input-${size}
-    k-rounded-${rounded}
-    k-input-${fillMode}
+    k-input-{size}
+    k-rounded-{rounded}
+    k-input-{fillMode}
 
-    ${valid && 'k-valid'}
-    ${invalid && 'k-invalid'}
-    ${required && 'k-required'}
-    ${disabled && 'k-disabled'}
+    {valid && 'k-valid'}
+    {invalid && 'k-invalid'}
+    {loading && 'k-loading'}
+    {required && 'k-required'}
+    {disabled && 'k-disabled'}
 ">
+    {showInputIcon && inputIconName !== '' && <span class="k-input-icon k-i-icon k-i-{inputIconName}"></span>}
+    {inputPrefix && <span class="k-input-prefix">...</span>}
     <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-suffix">...</span>}
+    {showValidationIcon && valid && <span class="k-validation-icon k-icon k-i-check"></span>}
+    {showValidationIcon && invalid && <span class="k-validation-icon k-icon k-i-warning"></span>}
+    {showLoadingIcon && loading && <span class="k-icon k-i-loading"></span>}
+    {showClearValue && text !== '' && <span class="k-clear-value"><span class="k-icon k-i-x"></span></span>}
     {showSpinButton &&
         <span class="k-input-spinner k-spin-button">
             <button class="k-spinner-increase k-button k-icon-button k-button-solid k-button-solid-base">

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';
@@ -111,7 +111,7 @@ function DateInputStatic(props) {
             <InputValidationIconStatic {...props} />
             <InputLoadingIconStatic {...props} />
             <InputClearValueStatic {...props} />
-            {showSpinButton === true && <SpinButtonStatic className="k-input-spinner" />}
+            {showSpinButton === true && <SpinButtonStatic className="k-input-spinner" size={size} fillMode={fillMode} />}
         </InputStatic>
     );
 }
@@ -147,10 +147,10 @@ DateInputStatic.propTypes = {
     showLoadingIcon: typeof true,
     showClearButton: typeof true,
 
-    size: typeof [ 'none', 'small', 'medium', 'large' ],
-    rounded: typeof [ 'none', 'small', 'medium', 'large', 'pill' ],
+    size: typeof [ null, 'small', 'medium', 'large' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'pill' ],
 
-    fillMode: typeof [ 'none', 'solid', 'flat', 'outline' ],
+    fillMode: typeof [ null, 'solid', 'flat', 'outline' ],
 
     hover: typeof false,
     focus: typeof false,

package/src/datepicker/README.md

@@ -11,18 +11,24 @@
 <span class="
     k-datepicker
     k-input
-    k-input-${size}
-    k-rounded-${rounded}
-    k-input-${fillMode}
+    k-input-{size}
+    k-rounded-{rounded}
+    k-input-{fillMode}
 
-    ${valid && 'k-valid'}
-    ${invalid && 'k-invalid'}
-    ${required && 'k-required'}
-    ${disabled && 'k-disabled'}
+    {valid && 'k-valid'}
+    {invalid && 'k-invalid'}
+    {loading && 'k-loading'}
+    {required && 'k-required'}
+    {disabled && 'k-disabled'}
 ">
+    {showInputIcon && inputIconName !== '' && <span class="k-input-icon k-i-icon k-i-{inputIconName}"></span>}
+    {inputPrefix && <span class="k-input-prefix">...</span>}
     <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-suffix">...</span>}
+    {showValidationIcon && valid && <span class="k-validation-icon k-icon k-i-check"></span>}
+    {showValidationIcon && invalid && <span class="k-validation-icon k-icon k-i-warning"></span>}
+    {showLoadingIcon && loading && <span class="k-icon k-i-loading"></span>}
+    {showClearValue && text !== '' && <span class="k-clear-value"><span class="k-icon k-i-x"></span></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-calendar"></span>
     </button>

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';
@@ -110,7 +110,7 @@ function DatePickerStatic(props) {
             <InputValidationIconStatic {...props} />
             <InputLoadingIconStatic {...props} />
             <InputClearValueStatic {...props} />
-            <ButtonStatic className="k-input-button" icon="calendar" rounded="none" size={size} fillMode={fillMode}></ButtonStatic>
+            <ButtonStatic className="k-input-button" icon="calendar" shape={null} rounded={null} size={size} fillMode={fillMode}></ButtonStatic>
         </InputStatic>
     );
 }
@@ -149,10 +149,10 @@ DatePickerStatic.propTypes = {
     prefix: typeof '#fragment',
     suffix: typeof '#fragment',
 
-    size: typeof [ 'none', 'small', 'medium', 'large' ],
-    rounded: typeof [ 'none', 'small', 'medium', 'large', 'pill' ],
+    size: typeof [ null, 'small', 'medium', 'large' ],
+    rounded: typeof [ null, 'small', 'medium', 'large', 'pill' ],
 
-    fillMode: typeof [ 'none', 'solid', 'flat', 'outline' ],
+    fillMode: typeof [ null, 'solid', 'flat', 'outline' ],
 
     hover: typeof false,
     focus: typeof false,