Skip to content

Form: fix get item by path (T1311534) #31492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2025
Merged

Form: fix get item by path (T1311534) #31492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b83f585
Form: fix get item by path (T1311534)
anna-shakhova Oct 28, 2025
9a2732e
Form: rearrange form tests
anna-shakhova Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 18 additions & 26 deletions packages/devextreme/js/__internal/ui/form/form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,11 +1448,11 @@ class Form extends Widget<FormProperties> {
_getItemByField(field: string | {
fieldName: string;
fieldPath: string[];
}, items: PreparedItem[]): PreparedItem | false {
}, items: PreparedItem[]): PreparedItem | null {
const fieldParts = isObject(field) ? field : this._getFieldParts(field);
const { fieldName } = fieldParts;
const { fieldPath } = fieldParts;
let resultItem: PreparedItem | false = false;
let resultItem: PreparedItem | null = null;

if (items.length) {
each(items, (_index: number, item: PreparedItem): boolean => {
Expand Down Expand Up @@ -1491,34 +1491,24 @@ class Form extends Widget<FormProperties> {
fieldName: string;
fieldPath: string[];
} {
const fieldSeparator = '.';
let fieldName = field;
let separatorIndex = fieldName.indexOf(fieldSeparator);
const resultPath = [];

while (separatorIndex !== -1) {
// @ts-expect-error ts-error
resultPath.push(fieldName.substr(0, separatorIndex));
fieldName = fieldName.substr(separatorIndex + 1);
separatorIndex = fieldName.indexOf(fieldSeparator);
}
const [fieldName, ...fieldPath] = field.split('.').reverse();

return {
fieldName,
fieldPath: resultPath.reverse(),
fieldPath,
};
}

_getItemByFieldPath(
path: string[],
fieldName: string,
item: Item,
): Item | false {
): Item | null {
const { itemType } = item;
const subItemsField = this._getSubItemField(itemType);

const isItemWithSubItems = itemType === 'group' || itemType === 'tabbed' || (item as TabItem).title;
let result: Item | false = false;
let result: Item | null = null;

do {
if (isItemWithSubItems) {
Expand All @@ -1534,7 +1524,7 @@ class Form extends Widget<FormProperties> {
pathNode = path.pop();
}

if (!path.length) {
if (!path.length && nameWithoutSpaces === pathNode) {
result = this._getItemByField(fieldName, item[subItemsField]);

// eslint-disable-next-line max-depth
Expand All @@ -1543,10 +1533,15 @@ class Form extends Widget<FormProperties> {
}
}

if (!isGroupWithName || (isGroupWithName && nameWithoutSpaces === pathNode)) {
const isGroupPathNodeOrUnnamed = !isGroupWithName
|| (isGroupWithName && nameWithoutSpaces === pathNode);

if (isGroupPathNodeOrUnnamed && path.length) {
result = this._searchItemInEverySubItem(path, fieldName, item[subItemsField]);

// eslint-disable-next-line max-depth
if (path.length) {
result = this._searchItemInEverySubItem(path, fieldName, item[subItemsField]);
if (!result) {
break;
}
}
} else {
Expand All @@ -1565,20 +1560,17 @@ class Form extends Widget<FormProperties> {
path: string[],
fieldName: string,
items: Item[],
): Item | false {
let result: Item | false = false;
): Item | null {
let result: Item | null = null;
each(items, (_index: number, groupItem: GroupItem): boolean => {
result = this._getItemByFieldPath(path.slice(), fieldName, groupItem);

if (result) {
return false;
}
return true;
});

if (!result) {
return false;
}

return result;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/ui/form/form.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const tryGetTabPath = (fullPath: string): string => {

export const getItemPath = (
items: PreparedItem[],
item: PreparedItem | false,
item: PreparedItem | null,
isTabs?: boolean,
): string => {
if (!item) {
Expand Down
20 changes: 20 additions & 0 deletions .../devextreme/testing/tests/DevExpress.ui.widgets.form/form.API.registerKeyHandler.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import $ from 'jquery';
import device from 'core/devices';

import 'ui/form';
import registerKeyHandlerTestHelper from '../../helpers/registerKeyHandlerTestHelper.js';

const EDITOR_INPUT_CLASS = 'dx-texteditor-input';

QUnit.testStart(function() {
const markup = '<div id="form"></div>';
Expand Down Expand Up @@ -32,3 +36,19 @@ QUnit.test('Set { items: [{dataField}] }, call registerKeyHandler', function(ass
form.registerKeyHandler('tab', handler);
assert.ok(true, 'no exceptions');
});

if(device.current().deviceType === 'desktop') {
const items = [
{ dataField: 'name', editorType: 'dxTextBox' },
{ dataField: 'age', editorType: 'dxNumberBox' }
];

items.forEach((item) => {
registerKeyHandlerTestHelper.runTests({
createWidget: ($element) => $element.dxForm({ items: items }).dxForm('instance'),
keyPressTargetElement: (widget) => widget.getEditor(item.dataField).$element().find(`.${EDITOR_INPUT_CLASS}`),
checkInitialize: false,
testNamePrefix: `Form -> ${item.editorType}:`
});
});
}
8 changes: 4 additions & 4 deletions ...treme/testing/tests/DevExpress.ui.widgets.form/form.API.update_items_dynamically.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,19 +2055,19 @@ module('Align labels', () => {
}]
});

testWrapper.setItemOption('title1.group1.description', 'visible', false);
testWrapper.setItemOption('title1.group2.description', 'visible', false);
testWrapper.checkLabelsWidthInGroup({ columnIndex: 0, groupColumnIndex: 0, etalonLabelText: 'Home Address' });
testWrapper.checkLabelsWidthInGroup({ columnIndex: 0, groupColumnIndex: 1, etalonLabelText: 'Last Name' });

testWrapper.setItemOption('title1.group1.homeAddress', 'visible', false);
testWrapper.setItemOption('title1.group2.homeAddress', 'visible', false);
testWrapper.checkLabelsWidthInGroup({ columnIndex: 0, groupColumnIndex: 0, etalonLabelText: 'Name' });
testWrapper.checkLabelsWidthInGroup({ columnIndex: 0, groupColumnIndex: 1, etalonLabelText: 'Last Name' });

testWrapper.setItemOption('title1.group1.description', 'visible', true);
testWrapper.setItemOption('title1.group2.description', 'visible', true);
testWrapper.checkLabelsWidthInGroup({ columnIndex: 0, groupColumnIndex: 0, etalonLabelText: 'Description' });
testWrapper.checkLabelsWidthInGroup({ columnIndex: 0, groupColumnIndex: 1, etalonLabelText: 'Last Name' });

testWrapper.setItemOption('title1.group1.homeAddress', 'visible', true);
testWrapper.setItemOption('title1.group2.homeAddress', 'visible', true);
testWrapper.checkLabelsWidthInGroup({ columnIndex: 0, groupColumnIndex: 0, etalonLabelText: 'Description' });
testWrapper.checkLabelsWidthInGroup({ columnIndex: 0, groupColumnIndex: 1, etalonLabelText: 'Home Address' });
});
Expand Down
Loading
Loading