@progress/kendo-themes-html 5.0.0-beta.3 → 5.0.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/autocomplete/autocomplete.jsx +1 -1
- package/src/avatar/README.md +1 -1
- package/src/avatar/avatar.jsx +1 -4
- package/src/button/button.jsx +38 -20
- package/src/checkbox/checkbox.jsx +2 -2
- package/src/chip/chip-avatar.jsx +1 -1
- package/src/index.js +1 -1
- package/src/input/input-inner-span.jsx +1 -1
- package/src/list/list-item.jsx +2 -2
- package/src/{dropdownbutton → menubutton}/README.md +20 -20
- package/src/menubutton/index.js +1 -0
- package/src/{dropdownbutton/dropdownbutton.jsx → menubutton/menubutton.jsx} +62 -46
- package/src/numerictextbox/numerictextbox.jsx +4 -6
- package/src/radio/radio.jsx +6 -2
- package/src/splitbutton/README.md +2 -2
- package/src/splitbutton/splitbutton.jsx +53 -29
- package/src/treeview/treeview-item.jsx +2 -2
- package/src/dropdownbutton/index.js +0 -1
- package/src/menulist/menulist.jsx +0 -67
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@progress/kendo-themes-html",
|
|
3
3
|
"description": "A collection of HTML helpers used for developing Kendo UI themes",
|
|
4
|
-
"version": "5.0.0-beta.
|
|
4
|
+
"version": "5.0.0-beta.4",
|
|
5
5
|
"author": "Progress",
|
|
6
6
|
"license": "Apache-2.0",
|
|
7
7
|
"keywords": [
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"@rollup/plugin-node-resolve": "^13.1.2",
|
|
43
43
|
"rollup": "^2.62.0"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "1e906bdc564c2df671a6c1552c81dd56bc08d1c4"
|
|
46
46
|
}
|
|
@@ -75,7 +75,7 @@ function AutocompleteStatic(props) {
|
|
|
75
75
|
'k-autocomplete',
|
|
76
76
|
{
|
|
77
77
|
'k-state-hover': hover === true,
|
|
78
|
-
'k-state-
|
|
78
|
+
'k-state-focus': focus === true,
|
|
79
79
|
'k-state-invalid': invalid === true,
|
|
80
80
|
'k-state-required': required === true,
|
|
81
81
|
'k-state-disabled': disabled === true
|
package/src/avatar/README.md
CHANGED
package/src/avatar/avatar.jsx
CHANGED
|
@@ -48,10 +48,7 @@ function AvatarStatic(props) {
|
|
|
48
48
|
ownClassName,
|
|
49
49
|
'k-avatar',
|
|
50
50
|
`k-avatar-${themeColor}`,
|
|
51
|
-
|
|
52
|
-
'k-avatar-circle': rounded === 'full',
|
|
53
|
-
'k-avatar-rounded': rounded !== 'full' && rounded !== null
|
|
54
|
-
},
|
|
51
|
+
styles.roundedClass( rounded ),
|
|
55
52
|
styles.sizeClass( size, 'k-avatar' ),
|
|
56
53
|
styles.fillModeClass( fillMode, 'k-avatar' ),
|
|
57
54
|
styles.borderedClass( bordered, 'k-avatar' ),
|
package/src/button/button.jsx
CHANGED
|
@@ -6,6 +6,7 @@ class Button extends Component {
|
|
|
6
6
|
|
|
7
7
|
init() {
|
|
8
8
|
this._props.text = this.element.innerHTML;
|
|
9
|
+
this._props.children = [];
|
|
9
10
|
}
|
|
10
11
|
|
|
11
12
|
render() {
|
|
@@ -16,6 +17,7 @@ class Button extends Component {
|
|
|
16
17
|
function ButtonStatic(props) {
|
|
17
18
|
const {
|
|
18
19
|
className: ownClassName,
|
|
20
|
+
children,
|
|
19
21
|
|
|
20
22
|
text,
|
|
21
23
|
type,
|
|
@@ -61,22 +63,6 @@ function ButtonStatic(props) {
|
|
|
61
63
|
}
|
|
62
64
|
];
|
|
63
65
|
|
|
64
|
-
let legacyClasses = [
|
|
65
|
-
ownClassName,
|
|
66
|
-
'k-button',
|
|
67
|
-
{
|
|
68
|
-
'k-primary': themeColor === 'primary',
|
|
69
|
-
'k-flat': fillMode === 'flat',
|
|
70
|
-
'k-outline': fillMode === 'outline',
|
|
71
|
-
'k-state-hover': hover === true,
|
|
72
|
-
'k-state-focus': focus === true,
|
|
73
|
-
'k-state-active': active === true,
|
|
74
|
-
'k-state-selected': selected === true,
|
|
75
|
-
'k-state-disabled': disabled === true,
|
|
76
|
-
'k-icon-button': Boolean( icon) === true && Boolean(text) === false
|
|
77
|
-
}
|
|
78
|
-
];
|
|
79
|
-
|
|
80
66
|
// Augment attributes
|
|
81
67
|
htmlAttributes.disabled = disabled;
|
|
82
68
|
|
|
@@ -85,18 +71,47 @@ function ButtonStatic(props) {
|
|
|
85
71
|
: {};
|
|
86
72
|
|
|
87
73
|
if (legacy) {
|
|
74
|
+
|
|
75
|
+
let legacyClasses = [
|
|
76
|
+
ownClassName,
|
|
77
|
+
'k-button',
|
|
78
|
+
styles.fillModeClass( fillMode, 'k-button' ),
|
|
79
|
+
styles.themeColorClass( fillMode, themeColor, 'k-button' ),
|
|
80
|
+
{
|
|
81
|
+
'k-primary': themeColor === 'primary',
|
|
82
|
+
'k-flat': fillMode === 'flat',
|
|
83
|
+
'k-outline': fillMode === 'outline',
|
|
84
|
+
'k-state-hover': hover === true,
|
|
85
|
+
'k-state-focus': focus === true,
|
|
86
|
+
'k-state-active': active === true,
|
|
87
|
+
'k-state-selected': selected === true,
|
|
88
|
+
'k-state-disabled': disabled === true,
|
|
89
|
+
'k-icon-button': Boolean( icon) === true && Boolean(text) === false
|
|
90
|
+
}
|
|
91
|
+
];
|
|
92
|
+
|
|
88
93
|
return (
|
|
89
94
|
<button type={type} className={legacyClasses} {...ariaAttr} {...htmlAttributes}>
|
|
90
|
-
|
|
91
|
-
|
|
95
|
+
{ children.length === 0
|
|
96
|
+
? <>
|
|
97
|
+
<IconStatic className="k-button-icon" name={icon} />
|
|
98
|
+
{text && <span className="k-button-text">{text}</span>}
|
|
99
|
+
</>
|
|
100
|
+
: children
|
|
101
|
+
}
|
|
92
102
|
</button>
|
|
93
103
|
);
|
|
94
104
|
}
|
|
95
105
|
|
|
96
106
|
return (
|
|
97
107
|
<button type={type} className={buttonClasses} {...ariaAttr} {...htmlAttributes}>
|
|
98
|
-
|
|
99
|
-
|
|
108
|
+
{ children.length === 0
|
|
109
|
+
? <>
|
|
110
|
+
<IconStatic className="k-button-icon" name={icon} />
|
|
111
|
+
{text && <span className="k-button-text">{text}</span>}
|
|
112
|
+
</>
|
|
113
|
+
: children
|
|
114
|
+
}
|
|
100
115
|
</button>
|
|
101
116
|
);
|
|
102
117
|
}
|
|
@@ -104,6 +119,8 @@ function ButtonStatic(props) {
|
|
|
104
119
|
ButtonStatic.defaultProps = {
|
|
105
120
|
...globalDefaultProps,
|
|
106
121
|
|
|
122
|
+
children: [],
|
|
123
|
+
|
|
107
124
|
text: '',
|
|
108
125
|
icon: '',
|
|
109
126
|
|
|
@@ -119,6 +136,7 @@ ButtonStatic.defaultProps = {
|
|
|
119
136
|
};
|
|
120
137
|
|
|
121
138
|
ButtonStatic.propTypes = {
|
|
139
|
+
children: typeof [],
|
|
122
140
|
text: typeof '',
|
|
123
141
|
icon: typeof '',
|
|
124
142
|
|
|
@@ -74,12 +74,12 @@ function CheckboxStatic(props) {
|
|
|
74
74
|
];
|
|
75
75
|
|
|
76
76
|
return (
|
|
77
|
-
<input type="checkbox" className={legacyClasses} {...ariaAttr} {...htmlAttributes}
|
|
77
|
+
<span className="k-checkbox-wrap"><input type="checkbox" className={legacyClasses} {...ariaAttr} {...htmlAttributes} /></span>
|
|
78
78
|
);
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
return (
|
|
82
|
-
<input type="checkbox" className={checkboxClasses} {...ariaAttr} {...htmlAttributes}
|
|
82
|
+
<span className="k-checkbox-wrap"><input type="checkbox" className={checkboxClasses} {...ariaAttr} {...htmlAttributes} /></span>
|
|
83
83
|
);
|
|
84
84
|
}
|
|
85
85
|
|
package/src/chip/chip-avatar.jsx
CHANGED
package/src/index.js
CHANGED
|
@@ -38,7 +38,7 @@ export * from './chip/index';
|
|
|
38
38
|
|
|
39
39
|
// Native forms
|
|
40
40
|
export * from './button/index';
|
|
41
|
-
export * from './
|
|
41
|
+
export * from './menubutton/index';
|
|
42
42
|
export * from './splitbutton/index';
|
|
43
43
|
export * from './textbox/index';
|
|
44
44
|
export * from './textarea/index';
|
|
@@ -56,7 +56,7 @@ function InputInnerSpanStatic(props) {
|
|
|
56
56
|
{valueIcon}
|
|
57
57
|
{valueIcon === null && <IconStatic className="k-icon k-input-value-icon" name={valueIconName} />}
|
|
58
58
|
{showValue && value === '' && placeholder}
|
|
59
|
-
{showValue && value && <span className="k-value-text">{value}</span>}
|
|
59
|
+
{showValue && value && <span className="k-input-value-text">{value}</span>}
|
|
60
60
|
</span>
|
|
61
61
|
);
|
|
62
62
|
}
|
package/src/list/list-item.jsx
CHANGED
|
@@ -61,7 +61,7 @@ function ListItemStatic(props) {
|
|
|
61
61
|
if (legacy) {
|
|
62
62
|
return (
|
|
63
63
|
<li className={legacyListItemClasses} {...ariaAttr} {...htmlAttributes}>
|
|
64
|
-
{showCheckbox && <
|
|
64
|
+
{showCheckbox && <CheckboxStatic checked={checked} />}
|
|
65
65
|
{showIcon && <IconStatic name={iconName} />}
|
|
66
66
|
<span className="k-list-item-text">{children}</span>
|
|
67
67
|
{groupLabel !== '' && <div className="k-group">{groupLabel}</div>}
|
|
@@ -71,7 +71,7 @@ function ListItemStatic(props) {
|
|
|
71
71
|
|
|
72
72
|
return (
|
|
73
73
|
<li className={listItemClasses} {...ariaAttr} {...htmlAttributes}>
|
|
74
|
-
{showCheckbox && <
|
|
74
|
+
{showCheckbox && <CheckboxStatic checked={checked} />}
|
|
75
75
|
{showIcon && <IconStatic name={iconName} />}
|
|
76
76
|
<span className="k-list-item-text">{children}</span>
|
|
77
77
|
{groupLabel !== '' && <div className="k-list-item-group-label">{groupLabel}</div>}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
```html
|
|
2
2
|
<!-- default rendering -->
|
|
3
3
|
<div class="k-dropdown-button">
|
|
4
|
-
<button type="button" class="k-button k-button-md k-rounded-md k-button-solid k-button-solid-base">
|
|
4
|
+
<button type="button" class="k-menu-button k-button k-button-md k-rounded-md k-button-solid k-button-solid-base">
|
|
5
5
|
<span class="k-button-text">Text</span>
|
|
6
|
+
<span class="k-button-arrow"><span class="k-icon k-i-arrow-s"></span></span>
|
|
6
7
|
</button>
|
|
7
8
|
</div>
|
|
8
9
|
|
|
@@ -10,20 +11,19 @@
|
|
|
10
11
|
<div class="k-dropdown-button">
|
|
11
12
|
<button class="
|
|
12
13
|
k-button
|
|
13
|
-
|
|
14
|
-
k-button
|
|
15
|
-
k-button
|
|
16
|
-
k-rounded
|
|
17
|
-
k-button
|
|
18
|
-
k-button
|
|
19
|
-
k
|
|
20
|
-
|
|
14
|
+
{text === '' && icon !== '' && 'k-icon-button'}
|
|
15
|
+
k-button-{size}
|
|
16
|
+
k-button-{shape}
|
|
17
|
+
k-rounded-{rounded}
|
|
18
|
+
k-button-{fillMode}
|
|
19
|
+
k-button-{fillMode}-{themeColor}
|
|
20
|
+
k-{state}
|
|
21
|
+
{disabled && 'k-disabled'}
|
|
21
22
|
" type={type} disabled={disabled}>
|
|
22
|
-
{icon !== '' && <span class="k-button-icon k-icon k-i
|
|
23
|
-
{text !== '' && <span class="k-button-text">
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
</span>}
|
|
23
|
+
{icon !== '' && <span class="k-button-icon k-icon k-i-{icon}"></span>}
|
|
24
|
+
{text !== '' && <span class="k-button-text">Button</span>}
|
|
25
|
+
{showArrow && <span class="k-button-arrow"><span class="k-icon k-i-{arrowIconName}"></span></span>}
|
|
26
|
+
|
|
27
27
|
</button>
|
|
28
28
|
</div>
|
|
29
29
|
|
|
@@ -43,14 +43,14 @@
|
|
|
43
43
|
<!-- popup menu items canonical rendering -->
|
|
44
44
|
<div class="k-animation-container k-animation-container-fixed k-animation-container-shown">
|
|
45
45
|
<div class="k-popup k-menu-popup">
|
|
46
|
-
<ul class="k-group k-menu-group k-reset k-menu-group
|
|
46
|
+
<ul class="k-group k-menu-group k-reset k-menu-group-{size}">
|
|
47
47
|
<li class="k-item k-menu-item">
|
|
48
|
-
<span class="k-link k-menu-link k
|
|
49
|
-
{icon !== '' && <span class="k-icon k-i
|
|
48
|
+
<span class="k-link k-menu-link k-{state}">
|
|
49
|
+
{icon !== '' && <span class="k-icon k-i-{icon}"></span>}
|
|
50
50
|
{text !== '' && <span class="k-menu-link-text">Text</span>}
|
|
51
|
-
{hasChildren
|
|
52
|
-
<span class="k-menu-expand-arrow k-icon k-i
|
|
53
|
-
<span class="k-menu-expand-arrow k-icon k-i-none"></span>
|
|
51
|
+
{hasChildren
|
|
52
|
+
? <span class="k-menu-expand-arrow k-icon k-i-{arrowIconName}"></span>
|
|
53
|
+
: <span class="k-menu-expand-arrow k-icon k-i-none"></span>
|
|
54
54
|
}
|
|
55
55
|
</span>
|
|
56
56
|
</li>
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './menubutton.jsx';
|
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
import { Component, globalDefaultProps } from '../component/index';
|
|
2
2
|
import { ButtonStatic } from '../button/index';
|
|
3
|
+
import { IconStatic } from '../icon/index';
|
|
3
4
|
|
|
4
|
-
class
|
|
5
|
+
class MenuButton extends Component {
|
|
5
6
|
|
|
6
7
|
init() {
|
|
7
8
|
this._props.text = this.element.innerHTML;
|
|
9
|
+
this._props.children = [];
|
|
8
10
|
}
|
|
9
11
|
|
|
10
12
|
render() {
|
|
11
|
-
return <
|
|
13
|
+
return <MenuButtonStatic {...this.props} />;
|
|
12
14
|
}
|
|
13
15
|
}
|
|
14
16
|
|
|
15
|
-
function
|
|
17
|
+
function MenuButtonStatic(props) {
|
|
16
18
|
const {
|
|
17
19
|
className: ownClassName,
|
|
18
20
|
|
|
@@ -20,7 +22,6 @@ function DropDownButtonStatic(props) {
|
|
|
20
22
|
|
|
21
23
|
size,
|
|
22
24
|
rounded,
|
|
23
|
-
shape,
|
|
24
25
|
|
|
25
26
|
fillMode,
|
|
26
27
|
themeColor,
|
|
@@ -42,22 +43,9 @@ function DropDownButtonStatic(props) {
|
|
|
42
43
|
...htmlAttributes
|
|
43
44
|
} = props;
|
|
44
45
|
|
|
45
|
-
let
|
|
46
|
+
let menuButtonClasses = [
|
|
46
47
|
ownClassName,
|
|
47
|
-
'k-
|
|
48
|
-
{
|
|
49
|
-
'k-focus': focus === true
|
|
50
|
-
}
|
|
51
|
-
];
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
let legacyDropDownButtonClasses = [
|
|
55
|
-
ownClassName,
|
|
56
|
-
'k-widget',
|
|
57
|
-
'k-dropdown-button',
|
|
58
|
-
{
|
|
59
|
-
'k-state-focused': focus === true
|
|
60
|
-
}
|
|
48
|
+
'k-menu-button'
|
|
61
49
|
];
|
|
62
50
|
|
|
63
51
|
// Augment attributes
|
|
@@ -68,38 +56,65 @@ function DropDownButtonStatic(props) {
|
|
|
68
56
|
: {};
|
|
69
57
|
|
|
70
58
|
if (legacy) {
|
|
71
|
-
return (
|
|
72
|
-
<div className={legacyDropDownButtonClasses} {...ariaAttr} {...htmlAttributes}>
|
|
73
|
-
<ButtonStatic legacy={true}></ButtonStatic>
|
|
74
|
-
</div>
|
|
75
|
-
);
|
|
76
|
-
}
|
|
77
59
|
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
60
|
+
let legacyMenuButtonClasses = [
|
|
61
|
+
ownClassName,
|
|
62
|
+
'k-menu-button'
|
|
63
|
+
];
|
|
64
|
+
|
|
65
|
+
return (
|
|
66
|
+
<ButtonStatic className={legacyMenuButtonClasses}
|
|
67
|
+
text={text}
|
|
68
|
+
icon={icon}
|
|
82
69
|
|
|
83
|
-
return (
|
|
84
|
-
<div className={dropDownButtonClasses} {...ariaAttr} {...htmlAttributes}>
|
|
85
|
-
<ButtonStatic
|
|
86
|
-
text={renderText}
|
|
87
|
-
disabled={disabled}
|
|
88
|
-
hover={hover}
|
|
89
|
-
active={active}
|
|
90
|
-
selected={selected}
|
|
91
|
-
focus={focus}
|
|
92
70
|
size={size}
|
|
93
71
|
rounded={rounded}
|
|
94
|
-
shape={shape}
|
|
95
72
|
fillMode={fillMode}
|
|
96
73
|
themeColor={themeColor}
|
|
97
|
-
|
|
98
|
-
|
|
74
|
+
|
|
75
|
+
hover={hover}
|
|
76
|
+
focus={focus}
|
|
77
|
+
active={active}
|
|
78
|
+
selected={selected}
|
|
79
|
+
disabled={disabled}
|
|
80
|
+
|
|
81
|
+
{...ariaAttr}
|
|
82
|
+
{...htmlAttributes}
|
|
83
|
+
>
|
|
84
|
+
<IconStatic className="k-button-icon" name={icon} />
|
|
85
|
+
{text && <span className="k-button-text">{text}</span>}
|
|
86
|
+
{showArrow && <span className="k-menu-button-arrow k-button-arrow"><IconStatic name={arrowIconName} /></span>}
|
|
87
|
+
</ButtonStatic>
|
|
88
|
+
);
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
return (
|
|
92
|
+
<ButtonStatic className={menuButtonClasses}
|
|
93
|
+
text={text}
|
|
94
|
+
icon={icon}
|
|
95
|
+
|
|
96
|
+
size={size}
|
|
97
|
+
rounded={rounded}
|
|
98
|
+
fillMode={fillMode}
|
|
99
|
+
themeColor={themeColor}
|
|
100
|
+
|
|
101
|
+
hover={hover}
|
|
102
|
+
focus={focus}
|
|
103
|
+
active={active}
|
|
104
|
+
selected={selected}
|
|
105
|
+
disabled={disabled}
|
|
106
|
+
|
|
107
|
+
{...ariaAttr}
|
|
108
|
+
{...htmlAttributes}
|
|
109
|
+
>
|
|
110
|
+
<IconStatic className="k-button-icon" name={icon} />
|
|
111
|
+
{text && <span className="k-button-text">{text}</span>}
|
|
112
|
+
{showArrow && <span className="k-menu-button-arrow k-button-arrow"><IconStatic name={arrowIconName} /></span>}
|
|
113
|
+
</ButtonStatic>
|
|
99
114
|
);
|
|
100
115
|
}
|
|
101
116
|
|
|
102
|
-
|
|
117
|
+
MenuButtonStatic.defaultProps = {
|
|
103
118
|
...globalDefaultProps,
|
|
104
119
|
|
|
105
120
|
text: '',
|
|
@@ -109,13 +124,15 @@ DropDownButtonStatic.defaultProps = {
|
|
|
109
124
|
|
|
110
125
|
size: 'medium',
|
|
111
126
|
rounded: 'medium',
|
|
112
|
-
|
|
127
|
+
|
|
128
|
+
showArrow: 'true',
|
|
129
|
+
arrowIconName: 'arrow-s',
|
|
113
130
|
|
|
114
131
|
fillMode: 'solid',
|
|
115
132
|
themeColor: 'base'
|
|
116
133
|
};
|
|
117
134
|
|
|
118
|
-
|
|
135
|
+
MenuButtonStatic.propTypes = {
|
|
119
136
|
text: typeof '',
|
|
120
137
|
icon: typeof '',
|
|
121
138
|
|
|
@@ -124,7 +141,6 @@ DropDownButtonStatic.propTypes = {
|
|
|
124
141
|
|
|
125
142
|
size: typeof [ null, 'small', 'medium', 'large' ],
|
|
126
143
|
rounded: typeof [ null, '0', 'small', 'medium', 'large', 'full' ],
|
|
127
|
-
shape: typeof [ null, 'rectangle', 'square' ],
|
|
128
144
|
|
|
129
145
|
fillMode: typeof [ null, 'solid', 'flat', 'outline', 'link' ],
|
|
130
146
|
themeColor: typeof [ null, 'surface', 'base', 'primary' ],
|
|
@@ -142,4 +158,4 @@ DropDownButtonStatic.propTypes = {
|
|
|
142
158
|
htmlAttributes: typeof []
|
|
143
159
|
};
|
|
144
160
|
|
|
145
|
-
export {
|
|
161
|
+
export { MenuButton, MenuButtonStatic };
|
|
@@ -75,17 +75,15 @@ function NumericTextboxStatic(props) {
|
|
|
75
75
|
'k-widget',
|
|
76
76
|
'k-numerictextbox',
|
|
77
77
|
{
|
|
78
|
+
'k-state-hover': hover === true,
|
|
79
|
+
'k-state-focus': focus === true,
|
|
80
|
+
'k-state-invalid': invalid === true,
|
|
78
81
|
'k-state-disabled': disabled === true
|
|
79
82
|
}
|
|
80
83
|
];
|
|
81
84
|
|
|
82
85
|
let legacyWrapClasses = [
|
|
83
|
-
'k-numeric-wrap'
|
|
84
|
-
{
|
|
85
|
-
'k-state-hover': hover === true,
|
|
86
|
-
'k-state-focused': focus === true,
|
|
87
|
-
'k-state-invalid': invalid === true
|
|
88
|
-
}
|
|
86
|
+
'k-numeric-wrap'
|
|
89
87
|
];
|
|
90
88
|
|
|
91
89
|
let legacyInputClasses = [
|
package/src/radio/radio.jsx
CHANGED
|
@@ -62,10 +62,14 @@ function RadioStatic(props) {
|
|
|
62
62
|
}
|
|
63
63
|
];
|
|
64
64
|
|
|
65
|
-
return
|
|
65
|
+
return (
|
|
66
|
+
<span className="k-radio-wrap"><input type="radio" className={legacyClasses} {...ariaAttr} {...htmlAttributes}/></span>
|
|
67
|
+
);
|
|
66
68
|
}
|
|
67
69
|
|
|
68
|
-
return
|
|
70
|
+
return (
|
|
71
|
+
<span className="k-radio-wrap"><input type="radio" className={radioClasses} {...ariaAttr} {...htmlAttributes}/></span>
|
|
72
|
+
);
|
|
69
73
|
}
|
|
70
74
|
|
|
71
75
|
RadioStatic.defaultProps = {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
```html
|
|
2
2
|
<!-- default rendering -->
|
|
3
|
-
<div class="k-split-button k-button-group">
|
|
3
|
+
<div class="k-split-button k-button-group k-rounded-md">
|
|
4
4
|
<button
|
|
5
5
|
class="k-button k-button-md k-rounded-md k-button-solid k-button-solid-base"
|
|
6
6
|
type="button"
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
</div>
|
|
14
14
|
|
|
15
15
|
<!-- canonical rendering -->
|
|
16
|
-
<div class="k-split-button k-button-group">
|
|
16
|
+
<div class="k-split-button k-button-group k-rounded-${rounded}">
|
|
17
17
|
<button class="
|
|
18
18
|
k-button
|
|
19
19
|
${text === '' && icon !== '' && 'k-icon-button'}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as styles from '../../utils/styles';
|
|
1
2
|
import { Component, globalDefaultProps } from '../component/index';
|
|
2
3
|
import { ButtonStatic } from '../button/index';
|
|
3
4
|
|
|
@@ -5,6 +6,7 @@ class SplitButton extends Component {
|
|
|
5
6
|
|
|
6
7
|
init() {
|
|
7
8
|
this._props.text = this.element.innerHTML;
|
|
9
|
+
this._props.children = [];
|
|
8
10
|
}
|
|
9
11
|
|
|
10
12
|
render() {
|
|
@@ -20,7 +22,6 @@ function SplitButtonStatic(props) {
|
|
|
20
22
|
|
|
21
23
|
size,
|
|
22
24
|
rounded,
|
|
23
|
-
shape,
|
|
24
25
|
|
|
25
26
|
fillMode,
|
|
26
27
|
themeColor,
|
|
@@ -45,19 +46,7 @@ function SplitButtonStatic(props) {
|
|
|
45
46
|
ownClassName,
|
|
46
47
|
'k-split-button',
|
|
47
48
|
'k-button-group',
|
|
48
|
-
|
|
49
|
-
'k-focus': focus === true
|
|
50
|
-
}
|
|
51
|
-
];
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
let legacySplitButtonClasses = [
|
|
55
|
-
ownClassName,
|
|
56
|
-
'k-split-button',
|
|
57
|
-
'k-button-group',
|
|
58
|
-
{
|
|
59
|
-
'k-state-focused': focus === true
|
|
60
|
-
}
|
|
49
|
+
styles.roundedClass( rounded )
|
|
61
50
|
];
|
|
62
51
|
|
|
63
52
|
// Augment attributes
|
|
@@ -68,9 +57,42 @@ function SplitButtonStatic(props) {
|
|
|
68
57
|
: {};
|
|
69
58
|
|
|
70
59
|
if (legacy) {
|
|
60
|
+
|
|
61
|
+
let legacySplitButtonClasses = [
|
|
62
|
+
ownClassName,
|
|
63
|
+
'k-split-button',
|
|
64
|
+
'k-button-group'
|
|
65
|
+
];
|
|
66
|
+
|
|
71
67
|
return (
|
|
72
68
|
<div className={legacySplitButtonClasses} {...ariaAttr} {...htmlAttributes}>
|
|
73
|
-
<ButtonStatic
|
|
69
|
+
<ButtonStatic
|
|
70
|
+
text={text}
|
|
71
|
+
icon={icon}
|
|
72
|
+
|
|
73
|
+
size={size}
|
|
74
|
+
rounded={rounded}
|
|
75
|
+
fillMode={fillMode}
|
|
76
|
+
themeColor={themeColor}
|
|
77
|
+
|
|
78
|
+
hover={hover}
|
|
79
|
+
focus={focus}
|
|
80
|
+
active={active}
|
|
81
|
+
selected={selected}
|
|
82
|
+
disabled={disabled}
|
|
83
|
+
></ButtonStatic>
|
|
84
|
+
<ButtonStatic
|
|
85
|
+
className="k-split-button-arrow"
|
|
86
|
+
|
|
87
|
+
icon={arrowIconName}
|
|
88
|
+
|
|
89
|
+
size={size}
|
|
90
|
+
rounded={rounded}
|
|
91
|
+
fillMode={fillMode}
|
|
92
|
+
themeColor={themeColor}
|
|
93
|
+
|
|
94
|
+
disabled={disabled}
|
|
95
|
+
></ButtonStatic>
|
|
74
96
|
</div>
|
|
75
97
|
);
|
|
76
98
|
}
|
|
@@ -79,29 +101,31 @@ function SplitButtonStatic(props) {
|
|
|
79
101
|
<div className={splitButtonClasses} {...ariaAttr} {...htmlAttributes}>
|
|
80
102
|
<ButtonStatic
|
|
81
103
|
text={text}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
active={active}
|
|
85
|
-
selected={selected}
|
|
86
|
-
focus={focus}
|
|
104
|
+
icon={icon}
|
|
105
|
+
|
|
87
106
|
size={size}
|
|
88
107
|
rounded={rounded}
|
|
89
|
-
shape={shape}
|
|
90
108
|
fillMode={fillMode}
|
|
91
109
|
themeColor={themeColor}
|
|
92
|
-
|
|
93
|
-
<ButtonStatic
|
|
94
|
-
disabled={disabled}
|
|
110
|
+
|
|
95
111
|
hover={hover}
|
|
112
|
+
focus={focus}
|
|
96
113
|
active={active}
|
|
97
114
|
selected={selected}
|
|
98
|
-
|
|
115
|
+
disabled={disabled}
|
|
116
|
+
></ButtonStatic>
|
|
117
|
+
<ButtonStatic
|
|
118
|
+
className="k-split-button-arrow"
|
|
119
|
+
|
|
120
|
+
icon={arrowIconName}
|
|
121
|
+
|
|
99
122
|
size={size}
|
|
100
123
|
rounded={rounded}
|
|
101
|
-
shape={shape}
|
|
102
124
|
fillMode={fillMode}
|
|
103
125
|
themeColor={themeColor}
|
|
104
|
-
|
|
126
|
+
|
|
127
|
+
disabled={disabled}
|
|
128
|
+
></ButtonStatic>
|
|
105
129
|
</div>
|
|
106
130
|
);
|
|
107
131
|
}
|
|
@@ -112,12 +136,13 @@ SplitButtonStatic.defaultProps = {
|
|
|
112
136
|
text: '',
|
|
113
137
|
icon: '',
|
|
114
138
|
|
|
139
|
+
arrowIconName: 'arrow-s',
|
|
140
|
+
|
|
115
141
|
className: '',
|
|
116
142
|
type: 'button',
|
|
117
143
|
|
|
118
144
|
size: 'medium',
|
|
119
145
|
rounded: 'medium',
|
|
120
|
-
shape: 'rectangle',
|
|
121
146
|
|
|
122
147
|
fillMode: 'solid',
|
|
123
148
|
themeColor: 'base'
|
|
@@ -131,7 +156,6 @@ SplitButtonStatic.propTypes = {
|
|
|
131
156
|
|
|
132
157
|
size: typeof [ null, 'small', 'medium', 'large' ],
|
|
133
158
|
rounded: typeof [ null, 'small', 'medium', 'large', 'full' ],
|
|
134
|
-
shape: typeof [ null, 'rectangle', 'square' ],
|
|
135
159
|
|
|
136
160
|
fillMode: typeof [ null, 'solid', 'flat', 'outline', 'link' ],
|
|
137
161
|
themeColor: typeof [ null, 'surface', 'base', 'primary' ],
|
|
@@ -75,7 +75,7 @@ function TreeviewItemStatic(props) {
|
|
|
75
75
|
<li className={legacyTreeviewItemClasses} {...ariaAttr} {...htmlAttributes}>
|
|
76
76
|
<span className="k-mid">
|
|
77
77
|
{hasChildren && <span className="k-treeview-toggle"><IconStatic name={expanded ? 'collapse' : 'expand'} /></span>}
|
|
78
|
-
{showCheckbox && <
|
|
78
|
+
{showCheckbox && <CheckboxStatic checked={checked} />}
|
|
79
79
|
<TreeviewLeafStatic {...leafProps} />
|
|
80
80
|
</span>
|
|
81
81
|
{expanded && hasChildren && <TreeviewGroupStatic items={items} />}
|
|
@@ -87,7 +87,7 @@ function TreeviewItemStatic(props) {
|
|
|
87
87
|
<li className={treeviewItemClasses} {...ariaAttr} {...htmlAttributes}>
|
|
88
88
|
<span className="k-treeview-mid">
|
|
89
89
|
{hasChildren && <span className="k-treeview-toggle"><IconStatic name={expanded ? 'collapse' : 'expand'} /></span>}
|
|
90
|
-
{showCheckbox && <
|
|
90
|
+
{showCheckbox && <CheckboxStatic checked={checked} />}
|
|
91
91
|
<TreeviewLeafStatic {...leafProps} />
|
|
92
92
|
</span>
|
|
93
93
|
{expanded && hasChildren && <TreeviewGroupStatic items={items} />}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export * from './dropdownbutton.jsx';
|
|
@@ -1,67 +0,0 @@
|
|
|
1
|
-
import * as styles from '../../utils/styles';
|
|
2
|
-
import { Component, globalDefaultProps } from '../component';
|
|
3
|
-
|
|
4
|
-
class MenuList extends Component {
|
|
5
|
-
render() {
|
|
6
|
-
return <MenuListStatic {...this.props} />;
|
|
7
|
-
}
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
function MenuListStatic(props) {
|
|
11
|
-
const {
|
|
12
|
-
className: ownClassName,
|
|
13
|
-
|
|
14
|
-
size,
|
|
15
|
-
|
|
16
|
-
aria,
|
|
17
|
-
legacy,
|
|
18
|
-
|
|
19
|
-
...htmlAttributes
|
|
20
|
-
} = props;
|
|
21
|
-
|
|
22
|
-
let menuListClasses = [
|
|
23
|
-
ownClassName,
|
|
24
|
-
'k-group k-menu-group k-reset',
|
|
25
|
-
styles.sizeClass( size, 'k-menu-group' ),
|
|
26
|
-
];
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
let legacyMenuListClasses = [
|
|
30
|
-
ownClassName,
|
|
31
|
-
'k-group k-menu-group k-reset',
|
|
32
|
-
];
|
|
33
|
-
|
|
34
|
-
let ariaAttr = aria
|
|
35
|
-
? {}
|
|
36
|
-
: {};
|
|
37
|
-
|
|
38
|
-
if (legacy) {
|
|
39
|
-
return (
|
|
40
|
-
<ul className={legacyMenuListClasses} {...ariaAttr} {...htmlAttributes} />
|
|
41
|
-
);
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
return (
|
|
45
|
-
<ul className={menuListClasses} {...ariaAttr} {...htmlAttributes} />
|
|
46
|
-
);
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
MenuListStatic.defaultProps = {
|
|
50
|
-
...globalDefaultProps,
|
|
51
|
-
|
|
52
|
-
className: '',
|
|
53
|
-
|
|
54
|
-
size: 'medium'
|
|
55
|
-
};
|
|
56
|
-
|
|
57
|
-
MenuListStatic.propTypes = {
|
|
58
|
-
size: typeof [ null, 'small', 'medium', 'large' ],
|
|
59
|
-
|
|
60
|
-
aria: typeof false,
|
|
61
|
-
legacy: typeof false,
|
|
62
|
-
|
|
63
|
-
className: typeof '',
|
|
64
|
-
htmlAttributes: typeof []
|
|
65
|
-
};
|
|
66
|
-
|
|
67
|
-
export { MenuList, MenuListStatic };
|