Skip to content

Commit

Permalink
DataGrid - remove height warning from known list (#2956)
Browse files Browse the repository at this point in the history
* fix

* fix treelist adaptability demo

* fix TreeList-FormEditing demo

* fix TreeList-CustomizeKeyboardNavigation

* add missing ids

* fix

* fix lint
  • Loading branch information
pomahtri authored Dec 1, 2023
1 parent 8d35b3c commit 37f274f
Show file tree
Hide file tree
Showing 29 changed files with 90 additions and 26 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#employees {
padding: 10px;
max-height: 440px;
}
1 change: 1 addition & 0 deletions JSDemos/Demos/TreeList/Adaptability/React/styles.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#employees {
padding: 10px;
max-height: 440px;
}
1 change: 1 addition & 0 deletions JSDemos/Demos/TreeList/Adaptability/ReactJs/styles.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#employees {
padding: 10px;
max-height: 440px;
}
1 change: 1 addition & 0 deletions JSDemos/Demos/TreeList/Adaptability/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@ const expandedRowKeys = [1];
<style scoped>
#employees {
padding: 10px;
max-height: 440px;
}
</style>
1 change: 1 addition & 0 deletions JSDemos/Demos/TreeList/Adaptability/jQuery/styles.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#employees {
padding: 10px;
max-height: 440px;
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#employees {
max-height: 640px;
}

.options {
margin-top: 20px;
padding: 20px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#employees {
max-height: 640px;
}

.options {
margin-top: 20px;
padding: 20px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#employees {
max-height: 640px;
}

.options {
margin-top: 20px;
padding: 20px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#employees {
max-height: 640px;
}

.options {
margin-top: 20px;
padding: 20px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,20 @@

<body class="dx-viewport">
<div class="demo-container">
<div id="tree-list-demo">
<div id="employees"></div>
<div class="options">
<div class="caption">Options</div>
<div class="option-container">
<div class="option check-box">
<div id="editOnKeyPress"></div>
</div>
<div class="option">
<span class="option-caption">Enter Key Action</span>
<div class="select" id="enterKeyAction"></div>
</div>
<div class="option">
<span class="option-caption">Enter Key Direction</span>
<div class="select" id="enterKeyDirection"></div>
</div>
<div id="employees"></div>
<div class="options">
<div class="caption">Options</div>
<div class="option-container">
<div class="option check-box">
<div id="editOnKeyPress"></div>
</div>
<div class="option">
<span class="option-caption">Enter Key Action</span>
<div class="select" id="enterKeyAction"></div>
</div>
<div class="option">
<span class="option-caption">Enter Key Direction</span>
<div class="select" id="enterKeyDirection"></div>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
min-height: 700px;
}

#employees {
max-height: 640px;
}

.options {
margin-top: 20px;
padding: 20px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
::ng-deep #tree-list-demo {
#tree-list-demo {
min-height: 700px;
}

#employees {
max-height: 640px;
}
1 change: 1 addition & 0 deletions JSDemos/Demos/TreeList/FormEditing/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const onInitNewRow = (e: TreeListTypes.InitNewRowEvent) => {
const App = () => (
<div id="tree-list-demo">
<TreeList
id="employees"
dataSource={employees}
columnAutoWidth={true}
showRowLines={true}
Expand Down
4 changes: 4 additions & 0 deletions JSDemos/Demos/TreeList/FormEditing/React/styles.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#tree-list-demo {
min-height: 700px;
}

#employees {
max-height: 640px;
}
1 change: 1 addition & 0 deletions JSDemos/Demos/TreeList/FormEditing/ReactJs/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const onInitNewRow = (e) => {
const App = () => (
<div id="tree-list-demo">
<TreeList
id="employees"
dataSource={employees}
columnAutoWidth={true}
showRowLines={true}
Expand Down
4 changes: 4 additions & 0 deletions JSDemos/Demos/TreeList/FormEditing/ReactJs/styles.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#tree-list-demo {
min-height: 700px;
}

#employees {
max-height: 640px;
}
4 changes: 4 additions & 0 deletions JSDemos/Demos/TreeList/FormEditing/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,8 @@ function allowDeleting(e) {
#tree-list-demo {
min-height: 700px;
}
#employees {
max-height: 640px;
}
</style>
4 changes: 4 additions & 0 deletions JSDemos/Demos/TreeList/FormEditing/jQuery/styles.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#tree-list-demo {
min-height: 700px;
}

#employees {
max-height: 640px;
}
1 change: 1 addition & 0 deletions JSDemos/Demos/TreeList/PopupEditing/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const onInitNewRow = (e: TreeListTypes.InitNewRowEvent) => {
const App = () => (
<div id="tree-list-demo">
<TreeList
id="employees"
dataSource={employees}
columnAutoWidth={true}
showRowLines={true}
Expand Down
1 change: 1 addition & 0 deletions JSDemos/Demos/TreeList/PopupEditing/ReactJs/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const onInitNewRow = (e) => {
const App = () => (
<div id="tree-list-demo">
<TreeList
id="employees"
dataSource={employees}
columnAutoWidth={true}
showRowLines={true}
Expand Down
1 change: 1 addition & 0 deletions JSDemos/Demos/TreeList/SingleRowSelection/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const expandedRowKeys = [1];

const App = () => (
<TreeList
id="employees"
dataSource={employees}
showRowLines={true}
showBorders={true}
Expand Down
1 change: 1 addition & 0 deletions JSDemos/Demos/TreeList/SingleRowSelection/ReactJs/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { employees } from './data.js';
const expandedRowKeys = [1];
const App = () => (
<TreeList
id="employees"
dataSource={employees}
showRowLines={true}
showBorders={true}
Expand Down
3 changes: 2 additions & 1 deletion MVCDemos/Content/DemosStyles/TreeList/Adaptability.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#employees {
padding: 10px;
}
max-height: 440px;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
.options {
#employees {
max-height: 640px;
}

.options {
margin-top: 20px;
padding: 20px;
background-color: rgba(191, 191, 191, 0.15);
Expand Down
7 changes: 6 additions & 1 deletion MVCDemos/Content/DemosStyles/TreeList/FormEditing.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#tree-list-demo {
min-height: 700px;
}
}

#employees {
max-height: 640px;
}

Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#employees {
padding: 10px;
}
max-height: 440px;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
.options {
#employees {
max-height: 640px;
}

.options {
margin-top: 20px;
padding: 20px;
background-color: rgba(191, 191, 191, 0.15);
Expand Down
7 changes: 4 additions & 3 deletions NetCoreDemos/wwwroot/css/DemosStyles/TreeList/FormEditing.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#tree-list-demo {
min-height: 700px;
}
#employees {
max-height: 640px;
}

1 change: 0 additions & 1 deletion testing/known-warnings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@
"W0022 -",
"W1011 -",
"W1023 -",
"W1025 -",
"W2108 -"
]

0 comments on commit 37f274f

Please sign in to comment.