Skip to content

Commit 92bae80

Browse files
authored
refactor: replace .filter() usage with .find() and .some() (#4554)
1 parent e66ba0d commit 92bae80

17 files changed

Lines changed: 32 additions & 32 deletions

‎packages/context-menu/src/vaadin-contextmenu-items-mixin.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export const ItemsMixin = (superClass) =>
105105
// Overlay's outside click listener doesn't work with modeless
106106
// overlays (submenus) so we need additional logic for it
107107
this.__itemsOutsideClickListener = (e) => {
108-
if (!e.composedPath().filter((el) => el.localName === 'vaadin-context-menu-overlay')[0]) {
108+
if (!e.composedPath().some((el) => el.localName === 'vaadin-context-menu-overlay')) {
109109
this.dispatchEvent(new CustomEvent('items-outside-click'));
110110
}
111111
};
@@ -335,7 +335,7 @@ export const ItemsMixin = (superClass) =>
335335
});
336336
const openSubMenu = (
337337
e,
338-
itemElement = e.composedPath().filter((e) => e.localName === 'vaadin-context-menu-item')[0],
338+
itemElement = e.composedPath().find((e) => e.localName === 'vaadin-context-menu-item'),
339339
) => {
340340
// Delay enabling the mouseover listener to avoid it from triggering on parent menu open
341341
if (!this.__openListenerActive) {

‎packages/crud/src/vaadin-crud.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ class Crud extends SlotMixin(ControllerMixin(ElementMixin(ThemableMixin(PolymerE
11711171
/** @private */
11721172
__new(event) {
11731173
// This allows listening to parent element and fire only when clicking on default or custom new-button.
1174-
if (event.composedPath().filter((e) => e.nodeType === 1 && e.hasAttribute('new-button'))[0]) {
1174+
if (event.composedPath().some((e) => e.nodeType === 1 && e.hasAttribute('new-button'))) {
11751175
this.__confirmBeforeChangingEditedItem(null, true);
11761176
}
11771177
}

‎packages/field-highlighter/src/fields/vaadin-checkbox-group-observer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ export class CheckboxGroupObserver extends FieldObserver {
1212

1313
getFocusTarget(event) {
1414
const fields = this.getFields();
15-
return Array.from(event.composedPath()).filter((node) => fields.includes(node))[0];
15+
return Array.from(event.composedPath()).find((node) => fields.includes(node));
1616
}
1717
}

‎packages/field-highlighter/src/fields/vaadin-list-box-observer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ export class ListBoxObserver extends FieldObserver {
1212

1313
getFocusTarget(event) {
1414
const fields = this.getFields();
15-
return Array.from(event.composedPath()).filter((node) => fields.includes(node))[0];
15+
return Array.from(event.composedPath()).find((node) => fields.includes(node));
1616
}
1717
}

‎packages/field-highlighter/src/fields/vaadin-radio-group-observer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ export class RadioGroupObserver extends FieldObserver {
1212

1313
getFocusTarget(event) {
1414
const fields = this.getFields();
15-
return Array.from(event.composedPath()).filter((node) => fields.includes(node))[0];
15+
return Array.from(event.composedPath()).find((node) => fields.includes(node));
1616
}
1717
}

‎packages/field-highlighter/src/vaadin-user-tags.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ export class UserTags extends PolymerElement {
221221
}
222222

223223
getTagForUser(user) {
224-
return Array.from(this.wrapper.children).filter((tag) => tag.uid === user.id)[0];
224+
return Array.from(this.wrapper.children).find((tag) => tag.uid === user.id);
225225
}
226226

227227
getChangedTags(addedUsers, removedUsers) {

‎packages/grid-pro/src/vaadin-grid-pro-inline-editing-mixin.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ export const InlineEditingMixin = (superClass) =>
226226

227227
/** @private */
228228
_getRowByIndex(index) {
229-
return Array.from(this.$.items.children).filter((el) => el.index === index)[0];
229+
return Array.from(this.$.items.children).find((el) => el.index === index);
230230
}
231231

232232
/** @private */
@@ -456,7 +456,7 @@ export const InlineEditingMixin = (superClass) =>
456456
this._stopEdit();
457457

458458
if (nextRow && nextCol) {
459-
const nextCell = Array.from(nextRow.children).filter((cell) => cell._column === nextCol)[0];
459+
const nextCell = Array.from(nextRow.children).find((cell) => cell._column === nextCol);
460460
e.preventDefault();
461461

462462
// Prevent vaadin-grid handler from being called

‎packages/grid/src/vaadin-grid-column-resizing-mixin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const ColumnResizingMixin = (superClass) =>
5252

5353
const eventX = e.detail.x;
5454
const columnRowCells = Array.from(this.$.header.querySelectorAll('[part~="row"]:last-child [part~="cell"]'));
55-
const targetCell = columnRowCells.filter((cell) => cell._column === column)[0];
55+
const targetCell = columnRowCells.find((cell) => cell._column === column);
5656
// Resize the target column
5757
if (targetCell.offsetWidth) {
5858
const style = getComputedStyle(targetCell._content);

‎packages/grid/src/vaadin-grid-drag-and-drop-mixin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export const DragAndDropMixin = (superClass) =>
196196
return;
197197
}
198198

199-
let row = e.composedPath().filter((node) => node.localName === 'tr')[0];
199+
let row = e.composedPath().find((node) => node.localName === 'tr');
200200

201201
if (!this._effectiveSize || this.dropMode === DropMode.ON_GRID) {
202202
// The grid is empty or "on-grid" drop mode was used, always default to "empty"

‎packages/grid/src/vaadin-grid-event-context-mixin.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ export const EventContextMixin = (superClass) =>
4242
return context;
4343
}
4444

45-
context.section = ['body', 'header', 'footer', 'details'].filter(
45+
context.section = ['body', 'header', 'footer', 'details'].find(
4646
(section) => cell.getAttribute('part').indexOf(section) > -1,
47-
)[0];
47+
);
4848

4949
if (cell._column) {
5050
context.column = cell._column;

0 commit comments

Comments
 (0)