@reach/descendants - npm Package Compare versions

Comparing version 0.9.1 to 0.10.0

dist/descendants.cjs.development.js

@@ -248,22 +248,9 @@ 'use strict';
 
-    var selectableDescendants = descendants;
+    var selectableDescendants = filter ? descendants.filter(filter) : descendants; // Current index should map to the updated array vs. the original
+    // descendants array.
 
     if (filter) {
-      selectableDescendants = [];
-      var n = -1;
-
-      for (var i = 0; i < descendants.length; i++) {
-        var descendant = descendants[i];
-
-        if (filter(descendant)) {
-          selectableDescendants.push(_extends({}, descendant, {
-            index: n++
-          })); // Current index should map to the updated array vs. the original
-          // descendants array.
-
-          index = i === currentIndex ? n : index;
-        }
-      }
-
-      selectableDescendants = descendants.filter(filter);
+      index = selectableDescendants.findIndex(function (descendant) {
+        return descendant.index === currentIndex;
+      });
     } // We need some options for any of this to work!
@@ -270,0 +257,0 @@

dist/descendants.cjs.production.min.js

@@ -1,2 +0,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("react"),n=(e=t)&&"object"==typeof e&&"default"in e?e.default:e,r=require("@reach/utils");function o(){return(o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}function a(e,t){if(null==e)return{};var n,r,o={},a=Object.keys(e);for(r=0;r<a.length;r++)t.indexOf(n=a[r])>=0||(o[n]=e[n]);return o}exports.DescendantProvider=function(e){var r=e.context,i=e.children,c=e.items,u=e.set,s=n.useCallback((function(e){var t=e.element,n=a(e,["element"]);t&&u((function(e){var r,a;if(0===e.length)r=o({element:t,index:0},n),a=[].concat(e,[r]);else if(e.find((function(e){return e.element===t})))a=e;else{var i=e.findIndex((function(e){return!(!e.element||!t)&&Boolean(e.element.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_PRECEDING)}));r=o({element:t,index:i},n),a=-1===i?[].concat(e,[r]):[].concat(e.slice(0,i),[r],e.slice(i))}return a.map((function(e,t){return o({},e,{index:t})}))}))}),[]),l=t.useCallback((function(e){e&&u((function(t){return t.filter((function(t){return e!==t.element}))}))}),[]),f=t.useMemo((function(){return{descendants:c,registerDescendant:s,unregisterDescendant:l}}),[c,s,l]);return n.createElement(r.Provider,{value:f},i)},exports.createDescendantContext=function(e,t){return void 0===t&&(t={}),r.createNamedContext(e,o({descendants:[],registerDescendant:r.noop,unregisterDescendant:r.noop},t))},exports.useDescendant=function(e,n){var i=e.context,c=e.element,u=a(e,["context","element"]),s=t.useState()[1],l=t.useContext(i),f=l.registerDescendant,d=l.unregisterDescendant,v=l.descendants;return r.useIsomorphicLayoutEffect((function(){return c||s({}),f(o({element:c},u)),function(){return d(c)}}),[c].concat(Object.values(u))),null!=n?n:v.findIndex((function(e){return e.element===c}))},exports.useDescendantKeyDown=function(e,n){var r=t.useContext(e).descendants,a=n.callback,i=n.currentIndex,c=n.filter,u=n.key,s=void 0===u?"index":u,l=n.orientation,f=void 0===l?"vertical":l,d=n.rotate,v=void 0===d||d,p=n.rtl,D=void 0!==p&&p,h=null!=i?i:-1;return function(e){if(["ArrowDown","ArrowUp","ArrowLeft","ArrowRight","PageUp","PageDown","Home","End"].includes(e.key)){var t=r;if(c){t=[];for(var n=-1,u=0;u<r.length;u++){var l=r[u];c(l)&&(t.push(o({},l,{index:n++})),h=u===i?n:h)}t=r.filter(c)}if(t.length)switch(e.key){case"ArrowDown":if("vertical"===f||"both"===f){e.preventDefault();var d=y();a("option"===s?d:d[s])}break;case"ArrowUp":if("vertical"===f||"both"===f){e.preventDefault();var p=P();a("option"===s?p:p[s])}break;case"ArrowLeft":if("horizontal"===f||"both"===f){e.preventDefault();var g=(D?y:P)();a("option"===s?g:g[s])}break;case"ArrowRight":if("horizontal"===f||"both"===f){e.preventDefault();var m=(D?P:y)();a("option"===s?m:m[s])}break;case"PageUp":e.preventDefault();var x=(e.ctrlKey?P:O)();a("option"===s?x:x[s]);break;case"Home":e.preventDefault();var b=O();a("option"===s?b:b[s]);break;case"PageDown":e.preventDefault();var w=(e.ctrlKey?y:A)();a("option"===s?w:w[s]);break;case"End":e.preventDefault();var k=A();a("option"===s?k:k[s])}}function y(){return h===t.length-1?v?O():t[h]:t[(h+1)%t.length]}function P(){return 0===h?v?A():t[h]:t[(h-1+t.length)%t.length]}function O(){return t[0]}function A(){return t[t.length-1]}}},exports.useDescendants=function(){return t.useState([])};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,n=require("react"),t=(e=n)&&"object"==typeof e&&"default"in e?e.default:e,r=require("@reach/utils");function o(){return(o=Object.assign||function(e){for(var n=1;n<arguments.length;n++){var t=arguments[n];for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])}return e}).apply(this,arguments)}function a(e,n){if(null==e)return{};var t,r,o={},a=Object.keys(e);for(r=0;r<a.length;r++)n.indexOf(t=a[r])>=0||(o[t]=e[t]);return o}exports.DescendantProvider=function(e){var r=e.context,i=e.children,c=e.items,u=e.set,s=t.useCallback((function(e){var n=e.element,t=a(e,["element"]);n&&u((function(e){var r,a;if(0===e.length)r=o({element:n,index:0},t),a=[].concat(e,[r]);else if(e.find((function(e){return e.element===n})))a=e;else{var i=e.findIndex((function(e){return!(!e.element||!n)&&Boolean(e.element.compareDocumentPosition(n)&Node.DOCUMENT_POSITION_PRECEDING)}));r=o({element:n,index:i},t),a=-1===i?[].concat(e,[r]):[].concat(e.slice(0,i),[r],e.slice(i))}return a.map((function(e,n){return o({},e,{index:n})}))}))}),[]),l=n.useCallback((function(e){e&&u((function(n){return n.filter((function(n){return e!==n.element}))}))}),[]),f=n.useMemo((function(){return{descendants:c,registerDescendant:s,unregisterDescendant:l}}),[c,s,l]);return t.createElement(r.Provider,{value:f},i)},exports.createDescendantContext=function(e,n){return void 0===n&&(n={}),r.createNamedContext(e,o({descendants:[],registerDescendant:r.noop,unregisterDescendant:r.noop},n))},exports.useDescendant=function(e,t){var i=e.context,c=e.element,u=a(e,["context","element"]),s=n.useState()[1],l=n.useContext(i),f=l.registerDescendant,d=l.unregisterDescendant,v=l.descendants;return r.useIsomorphicLayoutEffect((function(){return c||s({}),f(o({element:c},u)),function(){return d(c)}}),[c].concat(Object.values(u))),null!=t?t:v.findIndex((function(e){return e.element===c}))},exports.useDescendantKeyDown=function(e,t){var r=n.useContext(e).descendants,o=t.callback,a=t.currentIndex,i=t.filter,c=t.key,u=void 0===c?"index":c,s=t.orientation,l=void 0===s?"vertical":s,f=t.rotate,d=void 0===f||f,v=t.rtl,p=void 0!==v&&v,D=null!=a?a:-1;return function(e){if(["ArrowDown","ArrowUp","ArrowLeft","ArrowRight","PageUp","PageDown","Home","End"].includes(e.key)){var n=i?r.filter(i):r;if(i&&(D=n.findIndex((function(e){return e.index===a}))),n.length)switch(e.key){case"ArrowDown":if("vertical"===l||"both"===l){e.preventDefault();var t=m();o("option"===u?t:t[u])}break;case"ArrowUp":if("vertical"===l||"both"===l){e.preventDefault();var c=b();o("option"===u?c:c[u])}break;case"ArrowLeft":if("horizontal"===l||"both"===l){e.preventDefault();var s=(p?m:b)();o("option"===u?s:s[u])}break;case"ArrowRight":if("horizontal"===l||"both"===l){e.preventDefault();var f=(p?b:m)();o("option"===u?f:f[u])}break;case"PageUp":e.preventDefault();var v=(e.ctrlKey?b:w)();o("option"===u?v:v[u]);break;case"Home":e.preventDefault();var h=w();o("option"===u?h:h[u]);break;case"PageDown":e.preventDefault();var x=(e.ctrlKey?m:k)();o("option"===u?x:x[u]);break;case"End":e.preventDefault();var g=k();o("option"===u?g:g[u])}}function m(){return D===n.length-1?d?w():n[D]:n[(D+1)%n.length]}function b(){return 0===D?d?k():n[D]:n[(D-1+n.length)%n.length]}function w(){return n[0]}function k(){return n[n.length-1]}}},exports.useDescendants=function(){return n.useState([])};
 //# sourceMappingURL=descendants.cjs.production.min.js.map

dist/descendants.esm.js

@@ -241,22 +241,9 @@ import React, { useState, useContext, useCallback, useMemo } from 'react';
 
-    var selectableDescendants = descendants;
+    var selectableDescendants = filter ? descendants.filter(filter) : descendants; // Current index should map to the updated array vs. the original
+    // descendants array.
 
     if (filter) {
-      selectableDescendants = [];
-      var n = -1;
-
-      for (var i = 0; i < descendants.length; i++) {
-        var descendant = descendants[i];
-
-        if (filter(descendant)) {
-          selectableDescendants.push(_extends({}, descendant, {
-            index: n++
-          })); // Current index should map to the updated array vs. the original
-          // descendants array.
-
-          index = i === currentIndex ? n : index;
-        }
-      }
-
-      selectableDescendants = descendants.filter(filter);
+      index = selectableDescendants.findIndex(function (descendant) {
+        return descendant.index === currentIndex;
+      });
     } // We need some options for any of this to work!
@@ -263,0 +250,0 @@

package.json

 {
   "name": "@reach/descendants",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "description": "A descendant index solution for better accessibility support in compound components",
@@ -16,3 +16,3 @@ "author": "React Training <[e-mail]>",
   "dependencies": {
-    "@reach/utils": "^0.9.0",
+    "@reach/utils": "^0.10.0",
     "tslib": "^1.10.0"
@@ -31,3 +31,3 @@ },
   ],
-  "gitHead": "19b5b1ec7682dfed613512f1592958a47d43ad4d"
+  "gitHead": "e95268bdcebc7f0b5311beff4b6a8e29636decfe"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

99980

decreased by-2%

Lines of code

678

decreased by-2.59%

Dependency changes

• + Added@reach/utils@0.10.5(transitive)

• + Added@types/warning@3.0.3(transitive)

• + Addedtslib@2.7.0(transitive)

• - Removed@reach/utils@0.9.0(transitive)

• Updated@reach/utils@^0.10.0