From 9866fc1f5c4e288e97f6785eb21f56d527fb3f8a Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Fri, 6 Aug 2021 12:05:05 +0200 Subject: [PATCH] @uppy/utils: remove ponyfill for `Array#findIndex` (#3080) The built-in method is supported everywhere. --- .../provider-views/src/ProviderView/ProviderView.js | 2 +- packages/@uppy/utils/src/RateLimitedQueue.js | 4 +--- packages/@uppy/utils/src/findIndex.js | 9 +-------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/@uppy/provider-views/src/ProviderView/ProviderView.js b/packages/@uppy/provider-views/src/ProviderView/ProviderView.js index dc16cd3d0..319342864 100644 --- a/packages/@uppy/provider-views/src/ProviderView/ProviderView.js +++ b/packages/@uppy/provider-views/src/ProviderView/ProviderView.js @@ -112,7 +112,7 @@ module.exports = class ProviderView { let updatedDirectories const state = this.plugin.getPluginState() - const index = findIndex(state.directories, (dir) => id === dir.id) + const index = state.directories.findIndex((dir) => id === dir.id) if (index !== -1) { updatedDirectories = state.directories.slice(0, index + 1) diff --git a/packages/@uppy/utils/src/RateLimitedQueue.js b/packages/@uppy/utils/src/RateLimitedQueue.js index 3f65cf042..77e0589c2 100644 --- a/packages/@uppy/utils/src/RateLimitedQueue.js +++ b/packages/@uppy/utils/src/RateLimitedQueue.js @@ -1,5 +1,3 @@ -const findIndex = require('./findIndex') - function createCancelError () { return new Error('Cancelled') } @@ -84,7 +82,7 @@ class RateLimitedQueue { }, } - const index = findIndex(this.#queuedHandlers, (other) => { + const index = this.#queuedHandlers.findIndex((other) => { return handler.priority > other.priority }) if (index === -1) { diff --git a/packages/@uppy/utils/src/findIndex.js b/packages/@uppy/utils/src/findIndex.js index 17dd937b8..e963bdcb5 100644 --- a/packages/@uppy/utils/src/findIndex.js +++ b/packages/@uppy/utils/src/findIndex.js @@ -1,13 +1,6 @@ /** - * Array.prototype.findIndex ponyfill for old browsers. - * * @param {Array} array * @param {Function} predicate * @returns {number} */ -module.exports = function findIndex (array, predicate) { - for (let i = 0; i < array.length; i++) { - if (predicate(array[i])) return i - } - return -1 -} +module.exports = Function.prototype.call.bind(Array.prototype.findIndex)