Skip to content

Commit 520183b

Browse files
Merge branch '26_1' of https://github.com/DevExpress/DevExtreme into 26_1_global_format
2 parents 82d5346 + fbf26f9 commit 520183b

3 files changed

Lines changed: 26 additions & 3 deletions

File tree

packages/devextreme-angular/project.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
"devextreme"
88
],
99
"targets": {
10+
"clean:src-metadata": {
11+
"executor": "devextreme-nx-infra-plugin:clean",
12+
"options": {
13+
"targetDirectory": "./src/metadata"
14+
}
15+
},
1016
"clean:src-ui": {
1117
"executor": "devextreme-nx-infra-plugin:clean",
1218
"options": {
@@ -162,7 +168,7 @@
162168
"!{projectRoot}/src/ui/popup/index.ts",
163169
"{projectRoot}/src/index.ts",
164170
"{projectRoot}/src/common/index.ts",
165-
"{projectRoot}/metadata/generated/**/*"
171+
"{projectRoot}/src/metadata/generated/**/*"
166172
]
167173
},
168174
"regenerate": {
@@ -172,6 +178,7 @@
172178
],
173179
"options": {
174180
"commands": [
181+
"pnpm --workspace-root nx clean:src-metadata devextreme-angular",
175182
"pnpm --workspace-root nx clean:src-ui devextreme-angular",
176183
"pnpm --workspace-root nx generate-components devextreme-angular"
177184
],
@@ -183,7 +190,7 @@
183190
"!{projectRoot}/src/ui/popup/index.ts",
184191
"{projectRoot}/src/index.ts",
185192
"{projectRoot}/src/common/index.ts",
186-
"{projectRoot}/metadata/generated/**/*"
193+
"{projectRoot}/src/metadata/generated/**/*"
187194
],
188195
"inputs": [
189196
"default"

packages/devextreme/js/__internal/ui/splitter/splitter.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,9 +556,11 @@ class Splitter extends CollectionWidgetLiveUpdate<Properties> {
556556
const leftItemIndex = this._getIndexByItem(leftItemData);
557557
this._activeResizeHandleIndex = leftItemIndex;
558558

559+
const { orientation: currentOrientation } = this.option();
560+
559561
this._currentOnePxRatio = convertSizeToRatio(
560562
1,
561-
getElementSize($(this.element()), orientation),
563+
getElementSize($(this.element()), currentOrientation),
562564
this._getResizeHandlesSize(),
563565
);
564566

packages/devextreme/testing/tests/DevExpress.ui.widgets/splitter.tests.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3093,6 +3093,20 @@ QUnit.module('Resizing', moduleConfig, () => {
30933093
this.assertLayout(['75', '25']);
30943094
});
30953095

3096+
QUnit.test('resize should use current orientation for ratio calculation after orientation runtime change (T1327400)', function(assert) {
3097+
this.reinit({
3098+
width: 408, height: 208,
3099+
items: [{ }, { }],
3100+
});
3101+
3102+
this.instance.option('orientation', 'vertical');
3103+
3104+
const pointer = pointerMock(this.getResizeHandles().eq(0));
3105+
pointer.start().dragStart().drag(0, 50).dragEnd();
3106+
3107+
this.assertLayout(['75', '25']);
3108+
});
3109+
30963110
QUnit.test('drag resize should work after setting pane size to 0 programmatically', function(assert) {
30973111
this.reinit({
30983112
width: 208, height: 208,

0 commit comments

Comments
 (0)