Skip to content

Commit 18f364b

Browse files
committed
Sync with Kendo UI Professional
1 parent 95c1ed1 commit 18f364b

File tree

22 files changed

+755
-160
lines changed

22 files changed

+755
-160
lines changed

docs-aspnet/_config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -694,13 +694,13 @@ navigation:
694694
baseurl: /aspnet-core
695695

696696
## The Kendo UI version used
697-
cdnVersion: "2023.1.425"
697+
cdnVersion: "2023.2.606"
698698

699699
## The themes CDN used
700-
themesCdnVersion: "6.3.0"
700+
themesCdnVersion: "6.4.0"
701701

702702
## The MVC Core version used
703-
mvcCoreVersion: "2023.1.425"
703+
mvcCoreVersion: "2023.2.606"
704704

705705
ff-sheet-id: 1mottKpkbJFxkUq6rS3CsPrT8JQOE2JlUtsJBR622cxs
706706

docs-aspnet/html-helpers/charts/overview.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ The following example demonstrates how to define the Chart.
7171
</category-axis-item>
7272
</category-axis>
7373
<series>
74-
<series-item type="ChartSeriesType.Bar"
75-
field="Value"
74+
<series-item type="ChartSeriesType.Bar"
75+
field="Value"
7676
name="United States">
7777
</series-item>
7878
</series>
@@ -157,9 +157,7 @@ To configure the Chart, pass the configuration options as attributes:
157157
158158
<category-axis>
159159
<category-axis-item categories='new string[] { "2002", "2003", "2004", "2005", "2006", "2007", "2008", "2009", "20010", "2011", }'>
160-
<labels>
161-
<chart-category-axis-labels-padding top="135" />
162-
</labels>
160+
<labels position="ChartAxisLabelsPosition.Start" />
163161
<line visible="false" />
164162
</category-axis-item>
165163
</category-axis>
@@ -184,7 +182,7 @@ You can also add a title to clearly indicate the role of the axis.
184182
series.Column(new double[] { 20, 25, 32 }).Name("Temperature").Axis("temperature");
185183
series.Column(new double[] { 45, 50, 80 }).Name("Humidity").Axis("humidity");
186184
})
187-
.CategoryAxis(axis => axis
185+
.CategoryAxis(axis => axis
188186
.Categories("Aug", "Sep", "Oct")
189187
.AxisCrossingValue(0, 3)
190188
)
@@ -331,8 +329,8 @@ The following examples demonstrates how to subscribe to events by a handler name
331329
{% if site.core %}
332330
```TagHelper
333331
@addTagHelper *, Kendo.Mvc
334-
<kendo-chart name="chart"
335-
on-series-click="onSeriesClick"
332+
<kendo-chart name="chart"
333+
on-series-click="onSeriesClick"
336334
on-data-bound="onDataBound">
337335
</kendo-chart>
338336
```

docs-aspnet/html-helpers/data-management/grid/events.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ position: 5
88

99
# Events
1010

11-
You can subscribe to [all Grid events](/api/Kendo.Mvc.UI.Fluent/GridEventBuilder) and then use them to further customize the behavior of the Grid.
11+
You can subscribe to [all Grid events](/api/kendo.mvc.ui.fluent/grideventbuilder) and then use them to further customize the behavior of the Grid.
1212

13-
The example below demonstrates how to use the [`Change` event](/api/Kendo.Mvc.UI.Fluent/GridEventBuilder#changesystemstring) that the Grid generates when the user selects a table row or a cell.
13+
The example below demonstrates how to use the [`Change` event](/api/kendo.mvc.ui.fluent/grideventbuilder#changesystemstring) that the Grid generates when the user selects a table row or a cell.
1414

1515
```HtmlHelper
1616
@(Html.Kendo().Grid<Kendo.Mvc.Examples.Models.CustomerViewModel>()
@@ -23,6 +23,7 @@ The example below demonstrates how to use the [`Change` event](/api/Kendo.Mvc.UI
2323
columns.Bound(c => c.Country).Title("Country").Width(150);
2424
})
2525
.Groupable()
26+
.Selectable()
2627
.Events(events => events
2728
.Change("onChange")
2829
)
@@ -80,7 +81,7 @@ The example below demonstrates how to use the [`Change` event](/api/Kendo.Mvc.UI
8081

8182
## Next Steps
8283

83-
* [API for Configuring the Grid Events](/api/Kendo.Mvc.UI.Fluent/GridEventBuilder)
84+
* [API for Configuring the Grid Events](/api/kendo.mvc.ui.fluent/grideventbuilder)
8485
* [Using the Grid Events (Demo)](https://demos.telerik.com/{{ site.platform }}/grid/events)
8586

8687
## See Also

docs-aspnet/html-helpers/data-management/grid/row-resizing.md

Lines changed: 69 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -16,83 +16,89 @@ For a runnable example, refer to the [demo on Row Resizing in the Grid](https://
1616

1717
To enable the row resizing functionality set the `.Resizable()` configuration:
1818

19-
```HtmlHelper
20-
@(Html.Kendo().Grid<Kendo.Mvc.Examples.Models.OrderViewModel>()
21-
.Name("Grid")
22-
.Resizable(r => r.Rows(true))
23-
.Columns(columns =>
24-
{
25-
columns.Bound(p => p.ShipName).Title("Ship Name");
26-
})
27-
.DataSource(dataSource => dataSource
28-
.Ajax()
29-
.PageSize(10)
30-
.Read(read => read.Action("Orders_Read", "Grid"))
31-
)
32-
...
19+
```HtmlHelper
20+
@(Html.Kendo().Grid<Kendo.Mvc.Examples.Models.OrderViewModel>()
21+
.Name("Grid")
22+
.Resizable(r => r.Rows(true))
23+
.Columns(columns =>
24+
{
25+
columns.Bound(p => p.ShipName).Title("Ship Name");
26+
})
27+
.DataSource(dataSource => dataSource
28+
.Ajax()
29+
.PageSize(10)
30+
.Read(read => read.Action("Orders_Read", "Grid"))
3331
)
34-
```
35-
{% if site.core %}
36-
```TagHelper
37-
<kendo-grid name="grid" height="550" selectable="multiple, row">
38-
<datasource type="DataSourceTagHelperType.Custom" custom-type="odata" page-size="20">
39-
<transport>
40-
<read url="https://demos.telerik.com/kendo-ui/service/Northwind.svc/Orders" />
41-
</transport>
42-
</datasource>
43-
<resizable rows="true"/>
44-
<pageable button-count="5" refresh="true" page-sizes="new int[] { 5, 10, 20 }"></pageable>
45-
<columns>
46-
<column field="ShipName" title="Ship Name"/>
47-
</columns>
48-
</kendo-grid>
49-
````
32+
...
33+
)
34+
```
35+
{% if site.core %}
36+
```TagHelper
37+
<kendo-grid name="grid" height="550" selectable="multiple, row">
38+
<datasource type="DataSourceTagHelperType.Custom" custom-type="odata" page-size="20">
39+
<transport>
40+
<read url="https://demos.telerik.com/kendo-ui/service/Northwind.svc/Orders" />
41+
</transport>
42+
</datasource>
43+
<resizable rows="true"/>
44+
<pageable button-count="5" refresh="true" page-sizes="new int[] { 5, 10, 20 }"></pageable>
45+
<columns>
46+
<column field="ShipName" title="Ship Name"/>
47+
</columns>
48+
</kendo-grid>
49+
````
5050
{% endif %}
5151
5252
## Multiple Rows
5353
5454
The user can resize more than one row at the same time. To do so, set the `Selectable` configuration to enable multiple rows selection. Once the user has made multiple selections, they can drag the resize handle on one of the rows and the resize will affect the rest of the selected elements automatically.
5555
56-
```HtmlHelper
57-
@(Html.Kendo().Grid<Kendo.Mvc.Examples.Models.OrderViewModel>()
58-
.Name("Grid")
59-
.Selectable(selectable => selectable
60-
.Mode(GridSelectionMode.Multiple)
61-
.Type(GridSelectionType.Cell))
62-
.Resizable(r => r.Rows(true))
63-
.Columns(columns =>
64-
{
65-
columns.Bound(p => p.ShipName).Title("Ship Name");
66-
})
67-
.DataSource(dataSource => dataSource
68-
.Ajax()
69-
.PageSize(10)
70-
.Read(read => read.Action("Orders_Read", "Grid"))
71-
)
72-
...
56+
```HtmlHelper
57+
@(Html.Kendo().Grid<Kendo.Mvc.Examples.Models.OrderViewModel>()
58+
.Name("Grid")
59+
.Selectable(selectable => selectable
60+
.Mode(GridSelectionMode.Multiple)
61+
.Type(GridSelectionType.Cell))
62+
.Resizable(r => r.Rows(true))
63+
.Columns(columns =>
64+
{
65+
columns.Bound(p => p.ShipName).Title("Ship Name");
66+
})
67+
.DataSource(dataSource => dataSource
68+
.Ajax()
69+
.PageSize(10)
70+
.Read(read => read.Action("Orders_Read", "Grid"))
7371
)
74-
```
75-
{% if site.core %}
76-
```TagHelper
77-
<kendo-grid name="grid" height="550" selectable="multiple, row">
78-
<datasource type="DataSourceTagHelperType.Custom" custom-type="odata" page-size="20">
79-
<transport>
80-
<read url="https://demos.telerik.com/kendo-ui/service/Northwind.svc/Orders" />
81-
</transport>
82-
</datasource>
83-
<resizable rows="true"/>
84-
<pageable button-count="5" refresh="true" page-sizes="new int[] { 5, 10, 20 }"></pageable>
85-
<columns>
86-
<column field="ShipName" title="Ship Name"/>
87-
</columns>
88-
</kendo-grid>
89-
````
72+
...
73+
)
74+
```
75+
{% if site.core %}
76+
```TagHelper
77+
<kendo-grid name="grid" height="550" selectable="multiple, row">
78+
<datasource type="DataSourceTagHelperType.Custom" custom-type="odata" page-size="20">
79+
<transport>
80+
<read url="https://demos.telerik.com/kendo-ui/service/Northwind.svc/Orders" />
81+
</transport>
82+
</datasource>
83+
<resizable rows="true"/>
84+
<pageable button-count="5" refresh="true" page-sizes="new int[] { 5, 10, 20 }"></pageable>
85+
<columns>
86+
<column field="ShipName" title="Ship Name"/>
87+
</columns>
88+
</kendo-grid>
89+
````
9090
{% endif %}
9191
9292
## RowResize Event
9393
9494
The `RowResize` event fires when the user resizes one or more rows. You can subscribe to the event and use it to further customize the behavior of the Grid.
9595
96+
## Known Limitations
97+
98+
* The row resize feature does not work with the [drag & drop]({% slug htmlhelpers_row_drag_drop_grid %}) functionality of the Grid. You can use only one of the two features at the same time.
99+
* In a [Hierarchical]({% slug hierarchy_grid_htmlhelper_aspnetcore %}) scenario, only the innermost child Grid(s) can have resizable rows. The row resizing feature must be disabled for all the parent Grid components.
100+
* The row resizing functionality is not supported with [virtual scrolling]({% slug virtual_scrolling_aspnetcore_grid %}) as the virtual scrolling relies on calculating the average row height based on already loaded data. Having a large variance of row heights or an unknown number of rows that are not bound to data (such as group headers) can cause unexpected behavior.
101+
96102
## See Also
97103
98104
* [Row Resizing in the {{ site.product }} Grid](https://demos.telerik.com/{{ site.platform }}/grid/row-resizing)

docs-aspnet/html-helpers/editors/datepicker/overview.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,26 @@ The following example demonstrates the basic configuration for the DatePicker.
4444
```
4545
{% endif %}
4646

47+
## Model Binding
48+
49+
The DatePicker component respects DataAnnotations when the `DatePickerFor(m=>m.Property)` method is used. Besides the `[Required]` attribute, the `[DisplayFormat]` and `[Range]` attributes are also supported. The [`Format`](/api/kendo.mvc.ui.fluent/datepickerbuilder#formatsystemstring) configuration will be set to the provided DisplayFormat and the [`Min`](/api/kendo.mvc.ui.fluent/datepickerbuilder#minsystemstring) and [`Max`](/api/kendo.mvc.ui.fluent/datepickerbuilder#maxsystemstring) configurations will be set based on the range provided.
50+
51+
```HtmlHelper
52+
@(Html.Kendo().DatePickerFor(m=>m.MyDateTimeProperty))
53+
```
54+
{% if site.core %}
55+
```TagHelper
56+
<kendo-datepicker for="MyDateTimeProperty"
57+
</kendo-datepicker>
58+
```
59+
{% endif %}
60+
```C#
61+
[Required]
62+
[DisplayFormat(DataFormatString = "{0:dd/MM/yyyy}", ApplyFormatInEditMode = true)]
63+
[Range(typeof(DateTime), minimum:"01/01/2023", maximum:"31/12/2023")]
64+
public DateTime MyDateTimeProperty{ get; set; }
65+
```
66+
4767
## Functionality and Features
4868

4969
|Feature|Description|
@@ -70,4 +90,4 @@ The following example demonstrates the basic configuration for the DatePicker.
7090

7191
* [Using the API of the DatePicker HtmlHelper for {{ site.framework }} (Demo)](https://demos.telerik.com/{{ site.platform }}/datepicker/api)
7292
* [Server-Side API](/api/datepicker)
73-
* [Knowledge Base Section](/knowledge-base)
93+
* [Knowledge Base Section](/knowledge-base)

docs-aspnet/html-helpers/editors/datetimepicker/overview.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,26 @@ The `ParseFormats` option is of type `string[]` and can be assigned either by a
7676
```
7777
{% endif %}
7878

79+
## Model Binding
80+
81+
The DateTimePicker component respects DataAnnotations when the `DateTimePickerFor(m=>m.Property)` method is used. Besides the `[Required]` attribute, the `[DisplayFormat]` and `[Range]` attributes are also supported. The [`Format`](/api/kendo.mvc.ui.fluent/datetimepickerbuilder#formatsystemstring) configuration will be set to the provided DisplayFormat and the [`Min`](/api/kendo.mvc.ui.fluent/datetimepickerbuilder#minsystemstring) and [`Max`](/api/kendo.mvc.ui.fluent/datetimepickerbuilder#maxsystemstring) configurations will be set based on the range provided.
82+
83+
```HtmlHelper
84+
@(Html.Kendo().DateTimePickerFor(m=>m.MyDateTimeProperty))
85+
```
86+
{% if site.core %}
87+
```TagHelper
88+
<kendo-datetimepicker for="MyDateTimeProperty"
89+
</kendo-datetimepicker>
90+
```
91+
{% endif %}
92+
```C#
93+
[Required]
94+
[DisplayFormat(DataFormatString = "{0:dd/MM/yyyy}", ApplyFormatInEditMode = true)]
95+
[Range(typeof(DateTime), minimum:"01/01/2023", maximum:"31/12/2023")]
96+
public DateTime MyDateTimeProperty{ get; set; }
97+
```
98+
7999
## Functionality and Features
80100

81101
| Feature | Description |

docs-aspnet/html-helpers/layout/form/validation.md

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ position: 9
1010

1111
The Form has a built-in validator. Validation of all Form fields is triggered on form submission. By default, the Form displays a validation message when an editor is focused, then blurred without setting its value.
1212

13-
The following example shows how to disable the built-in validation on blur.
13+
The following example shows how to disable the built-in validation on blur.
1414

1515
```HtmlHelper
1616
@(Html.Kendo().Form<MyApplication.Models.UserViewModel>()
@@ -65,9 +65,9 @@ The following example shows how to disable the built-in validation on blur.
6565

6666
## Validation Summary
6767

68-
The Form can display a list of all validation errors. The validation summary is rendered as a unordered list of messages. By default, this option is disabled.
68+
The Form can display a list of all validation errors. The validation summary is rendered as an unordered list of messages. By default, this option is disabled.
6969

70-
The following example shows how to enable validation summary in the Form.
70+
The following example shows how to enable validation summary in the Form.
7171

7272
```HtmlHelper
7373
@(Html.Kendo().Form<MyApplication.Models.UserViewModel>()
@@ -99,7 +99,7 @@ The following example shows how to enable validation summary in the Form.
9999

100100
You can set the `ValidationSummary.Container` option, if you want to use an element as a container for the validation messages. This allows you to specify where the messages will be displayed, for example, above the Form, below it, or elsewhere on the page.
101101

102-
The following example shows how to set `ValidationSummary.Container`.
102+
The following example shows how to set `ValidationSummary.Container`.
103103

104104
```HtmlHelper
105105
<div class="container"></div>
@@ -162,7 +162,7 @@ The following example shows how to set `ValidationSummary.Container`.
162162

163163
You can customize validation error messages with templates.
164164

165-
The following example shows how to define a template with the `Validatable.ErrorTemplate` option.
165+
The following example shows how to define a template with the `Validatable.ErrorTemplate` option.
166166

167167
```HtmlHelper
168168
@(Html.Kendo().Form<MyApplication.Models.UserViewModel>()
@@ -196,7 +196,7 @@ The following example shows how to define a template with the `Validatable.Error
196196

197197
You can implement your own validation logic and return the respective error message, which the Form will display.
198198

199-
The following example demonstrates custom validation of the `LastName` and `RetireDate` fields.
199+
The following example demonstrates custom validation of the `LastName` and `RetireDate` fields.
200200

201201
```HtmlHelper
202202
@(Html.Kendo().Form<MyApplication.Models.UserViewModel>()
@@ -252,6 +252,21 @@ The following example demonstrates custom validation of the `LastName` and `Reti
252252
}
253253
```
254254

255+
## Custom Validation
256+
257+
The Form component supports DataAnnotation attributes and will configure the editors and the built-in validation based on the DataAnnotation attributes set for the model properties. The following table summarizes the supported DataAnnotation attributes:
258+
259+
|Attribute|Description|
260+
|----------|-----------|
261+
|[Required]| Adds the `required` atribute to a form element. |
262+
|[Compare]| Provides an attribute that compares two properties. |
263+
|[DataType]| Specifies the name of an additional type to associate with a data field. Supported types are `EmailAddress`, `Phone`, `Url`, `Text`, `Password` and `HiddenInput`.|
264+
|[RegularExpression]| Specifies that the field must match the specified regular expression. |
265+
|[Display]| Sets a value that is used for a Label and `title` attribute for the field, if they are not explicitly configured. |
266+
|[StringLength]| Specifies the minimum and maximum length of characters that are allowed in a data field.|
267+
|[HiddenInput]| Indicates whether the `<input />` element should be hidden. |
268+
|[Range]| Specifies the numeric range constraints for the property. |
269+
255270
## See Also
256271

257272
* [Validation Demo of the Form HtmlHelper for {{ site.framework }}](https://demos.telerik.com/{{ site.platform }}/form/validation)

docs-aspnet/styles-and-layout/sass-themes/compatibility.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ The following table lists the Telerik UI for {{ site.framework }} themes and the
1212

1313
| Telerik UI for {{ site.framework }} | Kendo UI Sass Themes |
1414
|:--- |:--- |
15+
| Telerik UI 2023.2.606 (R2 2023) | @progress/kendo-theme-bootstrap@6.4.0<br>@progress/kendo-theme-classic@6.4.0<br>@progress/kendo-theme-default@6.4.0<br>@progress/kendo-theme-fluent@6.4.0<br>@progress/kendo-theme-material@6.4.0 |
1516
| Telerik UI 2023.1.425 (R1 2023 SP2) | @progress/kendo-theme-bootstrap@6.3.0<br>@progress/kendo-theme-classic@6.3.0<br>@progress/kendo-theme-default@6.3.0<br>@progress/kendo-theme-fluent@6.3.0<br>@progress/kendo-theme-material@6.3.0 |
1617
| Telerik UI 2023.1.314 (R1 2023 SP1) | @progress/kendo-theme-bootstrap@6.2.0<br>@progress/kendo-theme-classic@6.2.0<br>@progress/kendo-theme-default@6.2.0<br>@progress/kendo-theme-fluent@6.2.0<br>@progress/kendo-theme-material@6.2.0 |
1718
| Telerik UI 2023.1.117 (R1 2023) | @progress/kendo-theme-bootstrap@5.10.0<br>@progress/kendo-theme-classic@5.10.0<br>@progress/kendo-theme-default@5.10.0<br>@progress/kendo-theme-fluent@5.10.0<br>@progress/kendo-theme-material@5.10.0 |

docs/_config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -699,13 +699,13 @@ navigation:
699699
baseurl: /kendo-ui
700700

701701
## The Kendo UI version used
702-
cdnVersion: "2023.1.425"
702+
cdnVersion: "2023.2.606"
703703

704704
## The themes CDN used
705-
themesCdnVersion: "6.3.0"
705+
themesCdnVersion: "6.4.0"
706706

707707
## The MVC Core version used
708-
mvcCoreVersion: "2023.1.425"
708+
mvcCoreVersion: "2023.2.606"
709709

710710
## Progress NPM Registry
711711
registry_url: 'https://registry.npm.telerik.com/'

0 commit comments

Comments
 (0)