Merge remote-tracking branch 'upstream/23_2' into new-navigation-tree…

…-23.2
DevExpress · Sep 11, 2023 · b81b206 · b81b206
2 parents fe201de + e0f42e3
commit b81b206
Show file tree

Hide file tree

Showing 18 changed files with 95 additions and 14 deletions.
diff --git a/api-reference/10 UI Components/dxCalendar/1 Configuration/value.md b/api-reference/10 UI Components/dxCalendar/1 Configuration/value.md
@@ -1,6 +1,6 @@
 ---
 id: dxCalendar.Options.value
-type: Date | Number | String
+type: Date | Number | String | Array<Date, Number, String>
 default: null
 ---
 ---

diff --git a/api-reference/10 UI Components/dxDataGrid/1 Configuration/onRowInserting.md b/api-reference/10 UI Components/dxDataGrid/1 Configuration/onRowInserting.md
@@ -18,7 +18,7 @@ The UI component's instance.
 ##### field(e.model): any
 Model data. Available only if you use Knockout.
 
-##### field(e.cancel): Promise<void>
+##### field(e.cancel): Boolean | Promise<Boolean> | Promise<void>
 **true**, a Promise resolved with **true**, or a rejected Promise stops row insertion.       
 **false** or a Promise resolved with **false** or **undefined** continues row insertion.
 

diff --git a/api-reference/10 UI Components/dxDataGrid/1 Configuration/onRowRemoving.md b/api-reference/10 UI Components/dxDataGrid/1 Configuration/onRowRemoving.md
@@ -18,7 +18,7 @@ The UI component's instance.
 ##### field(e.model): any
 Model data. Available only if you use Knockout.
 
-##### field(e.cancel): Boolean | Promise<void>
+##### field(e.cancel): Boolean | Promise<Boolean> | Promise<void>
 **true**, a Promise resolved with **true**, or a rejected Promise stops row removal.       
 **false** or a Promise resolved with **false** or **undefined** continues row removal.
 

diff --git a/api-reference/10 UI Components/dxDataGrid/1 Configuration/onRowUpdating.md b/api-reference/10 UI Components/dxDataGrid/1 Configuration/onRowUpdating.md
@@ -18,7 +18,7 @@ The UI component's instance.
 ##### field(e.model): any
 Model data. Available only if you use Knockout.
 
-##### field(e.cancel): Boolean | Promise<void>
+##### field(e.cancel): Boolean | Promise<Boolean> | Promise<void>
 **true**, a Promise resolved with **true**, or a rejected Promise stops row updating.       
 **false** or a Promise resolved with **false** or **undefined** continues row updating.
 

diff --git a/api-reference/10 UI Components/dxTabPanel/1 Configuration/iconPosition.md b/api-reference/10 UI Components/dxTabPanel/1 Configuration/iconPosition.md
@@ -0,0 +1,11 @@
+---
+id: dxTabPanel.Options.iconPosition
+type: Enums.TabsIconPosition
+default: 'start'
+---
+---
+##### shortDescription
+<!-- Description goes here -->
+
+---
+<!-- Description goes here -->
diff --git a/api-reference/10 UI Components/dxTabPanel/1 Configuration/stylingMode.md b/api-reference/10 UI Components/dxTabPanel/1 Configuration/stylingMode.md
@@ -0,0 +1,11 @@
+---
+id: dxTabPanel.Options.stylingMode
+type: Enums.TabsStyle
+default: 'primary'
+---
+---
+##### shortDescription
+<!-- Description goes here -->
+
+---
+<!-- Description goes here -->
diff --git a/api-reference/10 UI Components/dxTabs/1 Configuration/iconPosition.md b/api-reference/10 UI Components/dxTabs/1 Configuration/iconPosition.md
@@ -1,6 +1,6 @@
 ---
 id: dxTabs.Options.iconPosition
-type: Enums.IconPosition
+type: Enums.TabsIconPosition
 default: 'start'
 ---
 ---

diff --git a/api-reference/10 UI Components/dxTabs/1 Configuration/stylingMode.md b/api-reference/10 UI Components/dxTabs/1 Configuration/stylingMode.md
@@ -0,0 +1,11 @@
+---
+id: dxTabs.Options.stylingMode
+type: Enums.TabsStyle
+default: 'primary'
+---
+---
+##### shortDescription
+<!-- Description goes here -->
+
+---
+<!-- Description goes here -->
diff --git a/api-reference/10 UI Components/dxTreeList/1 Configuration/onRowInserting.md b/api-reference/10 UI Components/dxTreeList/1 Configuration/onRowInserting.md
@@ -18,7 +18,7 @@ The UI component's instance.
 ##### field(e.model): any
 Model data. Available only if you use Knockout.
 
-##### field(e.cancel): Promise<void>
+##### field(e.cancel): Boolean | Promise<Boolean> | Promise<void>
 **true**, a Promise resolved with **true**, or a rejected Promise stops row insertion.       
 **false** or a Promise resolved with **false** or **undefined** continues row insertion.
 

diff --git a/api-reference/10 UI Components/dxTreeList/1 Configuration/onRowRemoving.md b/api-reference/10 UI Components/dxTreeList/1 Configuration/onRowRemoving.md
@@ -18,7 +18,7 @@ The UI component's instance.
 ##### field(e.model): any
 Model data. Available only if you use Knockout.
 
-##### field(e.cancel): Boolean | Promise<void>
+##### field(e.cancel): Boolean | Promise<Boolean> | Promise<void>
 **true**, a Promise resolved with **true**, or a rejected Promise stops row removal.       
 **false** or a Promise resolved with **false** or **undefined** continues row removal.
 

diff --git a/api-reference/10 UI Components/dxTreeList/1 Configuration/onRowUpdating.md b/api-reference/10 UI Components/dxTreeList/1 Configuration/onRowUpdating.md
@@ -18,7 +18,7 @@ The UI component's instance.
 ##### field(e.model): any
 Model data. Available only if you use Knockout.
 
-##### field(e.cancel): Boolean | Promise<void>
+##### field(e.cancel): Boolean | Promise<Boolean> | Promise<void>
 **true**, a Promise resolved with **true**, or a rejected Promise stops row updating.       
 **false** or a Promise resolved with **false** or **undefined** continues row updating.
 

diff --git a/api-reference/40 Common Types/15 grids/RowInsertingInfo/cancel.md b/api-reference/40 Common Types/15 grids/RowInsertingInfo/cancel.md
@@ -1,6 +1,6 @@
 ---
 id: RowInsertingInfo.cancel
-type: Promise<void>
+type: Boolean | Promise<Boolean> | Promise<void>
 ---
 ---
 ##### shortDescription

diff --git a/api-reference/40 Common Types/15 grids/RowRemovingInfo/cancel.md b/api-reference/40 Common Types/15 grids/RowRemovingInfo/cancel.md
@@ -1,6 +1,6 @@
 ---
 id: RowRemovingInfo.cancel
-type: Boolean | Promise<void>
+type: Boolean | Promise<Boolean> | Promise<void>
 ---
 ---
 ##### shortDescription

diff --git a/api-reference/40 Common Types/15 grids/RowUpdatingInfo/cancel.md b/api-reference/40 Common Types/15 grids/RowUpdatingInfo/cancel.md
@@ -1,6 +1,6 @@
 ---
 id: RowUpdatingInfo.cancel
-type: Boolean | Promise<void>
+type: Boolean | Promise<Boolean> | Promise<void>
 ---
 ---
 ##### shortDescription

diff --git a/api-reference/_hidden/Enums/TabsIconPosition.md b/api-reference/_hidden/Enums/TabsIconPosition.md
@@ -0,0 +1,14 @@
+---
+id: Enums.TabsIconPosition
+acceptValues: 'top' | 'end' | 'bottom' | 'start'
+type: Union
+---
+---
+##### shortDescription
+<!-- Description goes here -->
+
+---
+<!--
+dxTabPanelOptions.iconPosition(/api-reference/10 UI Components/dxTabPanel/1 Configuration/iconPosition.md)(common.d.ts)
+dxTabsOptions.iconPosition(/api-reference/10 UI Components/dxTabs/1 Configuration/iconPosition.md)(common.d.ts)
+-->
diff --git a/api-reference/_hidden/Enums/TabsStyle.md b/api-reference/_hidden/Enums/TabsStyle.md
@@ -0,0 +1,14 @@
+---
+id: Enums.TabsStyle
+acceptValues: 'primary' | 'secondary'
+type: Union
+---
+---
+##### shortDescription
+<!-- Description goes here -->
+
+---
+<!--
+dxTabPanelOptions.stylingMode(/api-reference/10 UI Components/dxTabPanel/1 Configuration/stylingMode.md)(common.d.ts)
+dxTabsOptions.stylingMode(/api-reference/10 UI Components/dxTabs/1 Configuration/stylingMode.md)(common.d.ts)
+-->
diff --git a/applications/Icons/script.js b/applications/Icons/script.js
@@ -116,7 +116,9 @@
     "exportxlsx",
     "exportpdf",
     "exportselected",
+    "orders-box",
     "warning",
+    "task-helpneeded",
     "more",
     "square",
     "clearsquare",
@@ -158,6 +160,7 @@
     "mention",
     "variable",
     "clearformat",
+    "account-box",
     "fullscreen",
     "hierarchy",
     "docfile",
@@ -222,6 +225,11 @@
     "imgarunlock",
     "bell",
     "sun",
+    "task-complete",
+    "task-rejected",
+    "task-inprogress",
+    "task-stop",
+    "clear-circle",
     "photooutline",
     "panelright",
     "panelleft",

diff --git a/metadata/syntax-data.json b/metadata/syntax-data.json
@@ -17236,6 +17236,9 @@
     "dxTabPanelOptions.hoverStateEnabled": {
       "vue": "hover-state-enabled"
     },
+    "dxTabPanelOptions.iconPosition": {
+      "vue": "icon-position"
+    },
     "dxTabPanelOptions.items": {
       "angular": "dxi-item",
       "react": "Item",
@@ -17292,6 +17295,9 @@
     "dxTabPanelOptions.showNavButtons": {
       "vue": "show-nav-buttons"
     },
+    "dxTabPanelOptions.stylingMode": {
+      "vue": "styling-mode"
+    },
     "dxTabPanelOptions.swipeEnabled": {
       "vue": "swipe-enabled"
     },
@@ -17370,6 +17376,9 @@
     "dxTabsOptions.showNavButtons": {
       "vue": "show-nav-buttons"
     },
+    "dxTabsOptions.stylingMode": {
+      "vue": "styling-mode"
+    },
     "dxTagBox": {
       "angular": "dx-tag-box",
       "react": "TagBox",
@@ -19418,9 +19427,6 @@
     "enums.HtmlEditorPredefinedToolbarItem": {
       "vue": "html-editor-predefined-toolbar-item"
     },
-    "enums.IconPosition": {
-      "vue": "icon-position"
-    },
     "enums.ItemDeleteMode": {
       "vue": "item-delete-mode"
     },
@@ -19655,6 +19661,12 @@
     "enums.SummaryType": {
       "vue": "summary-type"
     },
+    "enums.TabsIconPosition": {
+      "vue": "tabs-icon-position"
+    },
+    "enums.TabsStyle": {
+      "vue": "tabs-style"
+    },
     "enums.TextBoxPredefinedButton": {
       "vue": "text-box-predefined-button"
     },