@react-aria/utils 3.33.0 → 3.33.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/dist/DOMFunctions.main.js +16 -3
  2. package/dist/DOMFunctions.main.js.map +1 -1
  3. package/dist/DOMFunctions.mjs +17 -5
  4. package/dist/DOMFunctions.module.js +17 -5
  5. package/dist/DOMFunctions.module.js.map +1 -1
  6. package/dist/getScrollParents.main.js +6 -5
  7. package/dist/getScrollParents.main.js.map +1 -1
  8. package/dist/getScrollParents.mjs +6 -5
  9. package/dist/getScrollParents.module.js +6 -5
  10. package/dist/getScrollParents.module.js.map +1 -1
  11. package/dist/import.mjs +2 -2
  12. package/dist/isScrollable.main.js +3 -0
  13. package/dist/isScrollable.main.js.map +1 -1
  14. package/dist/isScrollable.mjs +3 -0
  15. package/dist/isScrollable.module.js +3 -0
  16. package/dist/isScrollable.module.js.map +1 -1
  17. package/dist/main.js +1 -0
  18. package/dist/main.js.map +1 -1
  19. package/dist/module.js +2 -2
  20. package/dist/module.js.map +1 -1
  21. package/dist/runAfterTransition.main.js +13 -8
  22. package/dist/runAfterTransition.main.js.map +1 -1
  23. package/dist/runAfterTransition.mjs +13 -8
  24. package/dist/runAfterTransition.module.js +13 -8
  25. package/dist/runAfterTransition.module.js.map +1 -1
  26. package/dist/scrollIntoView.main.js +86 -53
  27. package/dist/scrollIntoView.main.js.map +1 -1
  28. package/dist/scrollIntoView.mjs +86 -53
  29. package/dist/scrollIntoView.module.js +86 -53
  30. package/dist/scrollIntoView.module.js.map +1 -1
  31. package/dist/types.d.ts +17 -4
  32. package/dist/types.d.ts.map +1 -1
  33. package/dist/useDrag1D.main.js +2 -2
  34. package/dist/useDrag1D.main.js.map +1 -1
  35. package/dist/useDrag1D.mjs +2 -2
  36. package/dist/useDrag1D.module.js +2 -2
  37. package/dist/useDrag1D.module.js.map +1 -1
  38. package/dist/useViewportSize.main.js +9 -4
  39. package/dist/useViewportSize.main.js.map +1 -1
  40. package/dist/useViewportSize.mjs +9 -4
  41. package/dist/useViewportSize.module.js +9 -4
  42. package/dist/useViewportSize.module.js.map +1 -1
  43. package/package.json +3 -3
  44. package/src/getScrollParents.ts +6 -5
  45. package/src/index.ts +1 -1
  46. package/src/isScrollable.ts +6 -0
  47. package/src/runAfterTransition.ts +11 -8
  48. package/src/scrollIntoView.ts +110 -71
  49. package/src/shadowdom/DOMFunctions.ts +38 -9
  50. package/src/useDrag1D.ts +2 -2
  51. package/src/useViewportSize.ts +11 -4
@@ -1,3 +1,5 @@
1
+ import {getEventTarget as $d4ee10de306f2510$export$e58f029f0fbfdb29} from "./DOMFunctions.module.js";
2
+
1
3
  /*
2
4
  * Copyright 2020 Adobe. All rights reserved.
3
5
  * This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -14,6 +16,7 @@
14
16
  // bugs, e.g. Chrome sometimes fires both transitionend and transitioncancel rather
15
17
  // than one or the other. So we need to track what's actually transitioning so that
16
18
  // we can ignore these duplicate events.
19
+
17
20
  let $bbed8b41f857bcc0$var$transitionsByElement = new Map();
18
21
  // A list of callbacks to call once there are no transitioning elements.
19
22
  let $bbed8b41f857bcc0$var$transitionCallbacks = new Set();
@@ -23,31 +26,33 @@ function $bbed8b41f857bcc0$var$setupGlobalEvents() {
23
26
  return 'propertyName' in event;
24
27
  }
25
28
  let onTransitionStart = (e)=>{
26
- if (!isTransitionEvent(e) || !e.target) return;
29
+ let eventTarget = (0, $d4ee10de306f2510$export$e58f029f0fbfdb29)(e);
30
+ if (!isTransitionEvent(e) || !eventTarget) return;
27
31
  // Add the transitioning property to the list for this element.
28
- let transitions = $bbed8b41f857bcc0$var$transitionsByElement.get(e.target);
32
+ let transitions = $bbed8b41f857bcc0$var$transitionsByElement.get(eventTarget);
29
33
  if (!transitions) {
30
34
  transitions = new Set();
31
- $bbed8b41f857bcc0$var$transitionsByElement.set(e.target, transitions);
35
+ $bbed8b41f857bcc0$var$transitionsByElement.set(eventTarget, transitions);
32
36
  // The transitioncancel event must be registered on the element itself, rather than as a global
33
37
  // event. This enables us to handle when the node is deleted from the document while it is transitioning.
34
38
  // In that case, the cancel event would have nowhere to bubble to so we need to handle it directly.
35
- e.target.addEventListener('transitioncancel', onTransitionEnd, {
39
+ eventTarget.addEventListener('transitioncancel', onTransitionEnd, {
36
40
  once: true
37
41
  });
38
42
  }
39
43
  transitions.add(e.propertyName);
40
44
  };
41
45
  let onTransitionEnd = (e)=>{
42
- if (!isTransitionEvent(e) || !e.target) return;
46
+ let eventTarget = (0, $d4ee10de306f2510$export$e58f029f0fbfdb29)(e);
47
+ if (!isTransitionEvent(e) || !eventTarget) return;
43
48
  // Remove property from list of transitioning properties.
44
- let properties = $bbed8b41f857bcc0$var$transitionsByElement.get(e.target);
49
+ let properties = $bbed8b41f857bcc0$var$transitionsByElement.get(eventTarget);
45
50
  if (!properties) return;
46
51
  properties.delete(e.propertyName);
47
52
  // If empty, remove transitioncancel event, and remove the element from the list of transitioning elements.
48
53
  if (properties.size === 0) {
49
- e.target.removeEventListener('transitioncancel', onTransitionEnd);
50
- $bbed8b41f857bcc0$var$transitionsByElement.delete(e.target);
54
+ eventTarget.removeEventListener('transitioncancel', onTransitionEnd);
55
+ $bbed8b41f857bcc0$var$transitionsByElement.delete(eventTarget);
51
56
  }
52
57
  // If no transitioning elements, call all of the queued callbacks.
53
58
  if ($bbed8b41f857bcc0$var$transitionsByElement.size === 0) {
@@ -1 +1 @@
1
- {"mappings":"AAAA;;;;;;;;;;CAUC,GAED,uEAAuE;AACvE,6EAA6E;AAC7E,iFAAiF;AACjF,mFAAmF;AACnF,mFAAmF;AACnF,wCAAwC;AACxC,IAAI,6CAAuB,IAAI;AAE/B,wEAAwE;AACxE,IAAI,4CAAsB,IAAI;AAE9B,SAAS;IACP,IAAI,OAAO,WAAW,aACpB;IAGF,SAAS,kBAAkB,KAAY;QACrC,OAAO,kBAAkB;IAC3B;IAEA,IAAI,oBAAoB,CAAC;QACvB,IAAI,CAAC,kBAAkB,MAAM,CAAC,EAAE,MAAM,EACpC;QAEF,+DAA+D;QAC/D,IAAI,cAAc,2CAAqB,GAAG,CAAC,EAAE,MAAM;QACnD,IAAI,CAAC,aAAa;YAChB,cAAc,IAAI;YAClB,2CAAqB,GAAG,CAAC,EAAE,MAAM,EAAE;YAEnC,+FAA+F;YAC/F,yGAAyG;YACzG,mGAAmG;YACnG,EAAE,MAAM,CAAC,gBAAgB,CAAC,oBAAoB,iBAAiB;gBAC7D,MAAM;YACR;QACF;QAEA,YAAY,GAAG,CAAC,EAAE,YAAY;IAChC;IAEA,IAAI,kBAAkB,CAAC;QACrB,IAAI,CAAC,kBAAkB,MAAM,CAAC,EAAE,MAAM,EACpC;QAEF,yDAAyD;QACzD,IAAI,aAAa,2CAAqB,GAAG,CAAC,EAAE,MAAM;QAClD,IAAI,CAAC,YACH;QAGF,WAAW,MAAM,CAAC,EAAE,YAAY;QAEhC,2GAA2G;QAC3G,IAAI,WAAW,IAAI,KAAK,GAAG;YACzB,EAAE,MAAM,CAAC,mBAAmB,CAAC,oBAAoB;YACjD,2CAAqB,MAAM,CAAC,EAAE,MAAM;QACtC;QAEA,kEAAkE;QAClE,IAAI,2CAAqB,IAAI,KAAK,GAAG;YACnC,KAAK,IAAI,MAAM,0CACb;YAGF,0CAAoB,KAAK;QAC3B;IACF;IAEA,SAAS,IAAI,CAAC,gBAAgB,CAAC,iBAAiB;IAChD,SAAS,IAAI,CAAC,gBAAgB,CAAC,iBAAiB;AAClD;AAEA,IAAI,OAAO,aAAa;IACtB,IAAI,SAAS,UAAU,KAAK,WAC1B;SAEA,SAAS,gBAAgB,CAAC,oBAAoB;;AAIlD;;;;CAIC,GACD,SAAS;IACP,KAAK,MAAM,CAAC,YAAY,IAAI,2CAC1B,sFAAsF;IACtF,kFAAkF;IAClF,IAAI,iBAAiB,eAAe,CAAC,YAAY,WAAW,EAC1D,2CAAqB,MAAM,CAAC;AAGlC;AAEO,SAAS,0CAAmB,EAAc;IAC/C,4EAA4E;IAC5E,sBAAsB;QACpB;QACA,gEAAgE;QAChE,+EAA+E;QAC/E,IAAI,2CAAqB,IAAI,KAAK,GAChC;aAEA,0CAAoB,GAAG,CAAC;IAE5B;AACF","sources":["packages/@react-aria/utils/src/runAfterTransition.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\n// We store a global list of elements that are currently transitioning,\n// mapped to a set of CSS properties that are transitioning for that element.\n// This is necessary rather than a simple count of transitions because of browser\n// bugs, e.g. Chrome sometimes fires both transitionend and transitioncancel rather\n// than one or the other. So we need to track what's actually transitioning so that\n// we can ignore these duplicate events.\nlet transitionsByElement = new Map<EventTarget, Set<string>>();\n\n// A list of callbacks to call once there are no transitioning elements.\nlet transitionCallbacks = new Set<() => void>();\n\nfunction setupGlobalEvents() {\n if (typeof window === 'undefined') {\n return;\n }\n\n function isTransitionEvent(event: Event): event is TransitionEvent {\n return 'propertyName' in event;\n }\n\n let onTransitionStart = (e: Event) => {\n if (!isTransitionEvent(e) || !e.target) {\n return;\n }\n // Add the transitioning property to the list for this element.\n let transitions = transitionsByElement.get(e.target);\n if (!transitions) {\n transitions = new Set();\n transitionsByElement.set(e.target, transitions);\n\n // The transitioncancel event must be registered on the element itself, rather than as a global\n // event. This enables us to handle when the node is deleted from the document while it is transitioning.\n // In that case, the cancel event would have nowhere to bubble to so we need to handle it directly.\n e.target.addEventListener('transitioncancel', onTransitionEnd, {\n once: true\n });\n }\n\n transitions.add(e.propertyName);\n };\n\n let onTransitionEnd = (e: Event) => {\n if (!isTransitionEvent(e) || !e.target) {\n return;\n }\n // Remove property from list of transitioning properties.\n let properties = transitionsByElement.get(e.target);\n if (!properties) {\n return;\n }\n\n properties.delete(e.propertyName);\n\n // If empty, remove transitioncancel event, and remove the element from the list of transitioning elements.\n if (properties.size === 0) {\n e.target.removeEventListener('transitioncancel', onTransitionEnd);\n transitionsByElement.delete(e.target);\n }\n\n // If no transitioning elements, call all of the queued callbacks.\n if (transitionsByElement.size === 0) {\n for (let cb of transitionCallbacks) {\n cb();\n }\n\n transitionCallbacks.clear();\n }\n };\n\n document.body.addEventListener('transitionrun', onTransitionStart);\n document.body.addEventListener('transitionend', onTransitionEnd);\n}\n\nif (typeof document !== 'undefined') {\n if (document.readyState !== 'loading') {\n setupGlobalEvents();\n } else {\n document.addEventListener('DOMContentLoaded', setupGlobalEvents);\n }\n}\n\n/**\n * Cleans up any elements that are no longer in the document.\n * This is necessary because we can't rely on transitionend events to fire\n * for elements that are removed from the document while transitioning.\n */\nfunction cleanupDetachedElements() {\n for (const [eventTarget] of transitionsByElement) {\n // Similar to `eventTarget instanceof Element && !eventTarget.isConnected`, but avoids\n // the explicit instanceof check, since it may be different in different contexts.\n if ('isConnected' in eventTarget && !eventTarget.isConnected) {\n transitionsByElement.delete(eventTarget);\n }\n }\n}\n\nexport function runAfterTransition(fn: () => void): void {\n // Wait one frame to see if an animation starts, e.g. a transition on mount.\n requestAnimationFrame(() => {\n cleanupDetachedElements();\n // If no transitions are running, call the function immediately.\n // Otherwise, add it to a list of callbacks to run at the end of the animation.\n if (transitionsByElement.size === 0) {\n fn();\n } else {\n transitionCallbacks.add(fn);\n }\n });\n}\n"],"names":[],"version":3,"file":"runAfterTransition.module.js.map"}
1
+ {"mappings":";;AAAA;;;;;;;;;;CAUC,GAED,uEAAuE;AACvE,6EAA6E;AAC7E,iFAAiF;AACjF,mFAAmF;AACnF,mFAAmF;AACnF,wCAAwC;;AAExC,IAAI,6CAAuB,IAAI;AAE/B,wEAAwE;AACxE,IAAI,4CAAsB,IAAI;AAE9B,SAAS;IACP,IAAI,OAAO,WAAW,aACpB;IAGF,SAAS,kBAAkB,KAAY;QACrC,OAAO,kBAAkB;IAC3B;IAEA,IAAI,oBAAoB,CAAC;QACvB,IAAI,cAAc,CAAA,GAAA,yCAAa,EAAE;QACjC,IAAI,CAAC,kBAAkB,MAAM,CAAC,aAC5B;QAEF,+DAA+D;QAC/D,IAAI,cAAc,2CAAqB,GAAG,CAAC;QAC3C,IAAI,CAAC,aAAa;YAChB,cAAc,IAAI;YAClB,2CAAqB,GAAG,CAAC,aAAa;YAEtC,+FAA+F;YAC/F,yGAAyG;YACzG,mGAAmG;YACnG,YAAY,gBAAgB,CAAC,oBAAoB,iBAAiB;gBAChE,MAAM;YACR;QACF;QAEA,YAAY,GAAG,CAAC,EAAE,YAAY;IAChC;IAEA,IAAI,kBAAkB,CAAC;QACrB,IAAI,cAAc,CAAA,GAAA,yCAAa,EAAE;QACjC,IAAI,CAAC,kBAAkB,MAAM,CAAC,aAC5B;QAEF,yDAAyD;QACzD,IAAI,aAAa,2CAAqB,GAAG,CAAC;QAC1C,IAAI,CAAC,YACH;QAGF,WAAW,MAAM,CAAC,EAAE,YAAY;QAEhC,2GAA2G;QAC3G,IAAI,WAAW,IAAI,KAAK,GAAG;YACzB,YAAY,mBAAmB,CAAC,oBAAoB;YACpD,2CAAqB,MAAM,CAAC;QAC9B;QAEA,kEAAkE;QAClE,IAAI,2CAAqB,IAAI,KAAK,GAAG;YACnC,KAAK,IAAI,MAAM,0CACb;YAGF,0CAAoB,KAAK;QAC3B;IACF;IAEA,SAAS,IAAI,CAAC,gBAAgB,CAAC,iBAAiB;IAChD,SAAS,IAAI,CAAC,gBAAgB,CAAC,iBAAiB;AAClD;AAEA,IAAI,OAAO,aAAa;IACtB,IAAI,SAAS,UAAU,KAAK,WAC1B;SAEA,SAAS,gBAAgB,CAAC,oBAAoB;;AAIlD;;;;CAIC,GACD,SAAS;IACP,KAAK,MAAM,CAAC,YAAY,IAAI,2CAC1B,sFAAsF;IACtF,kFAAkF;IAClF,IAAI,iBAAiB,eAAe,CAAC,YAAY,WAAW,EAC1D,2CAAqB,MAAM,CAAC;AAGlC;AAEO,SAAS,0CAAmB,EAAc;IAC/C,4EAA4E;IAC5E,sBAAsB;QACpB;QACA,gEAAgE;QAChE,+EAA+E;QAC/E,IAAI,2CAAqB,IAAI,KAAK,GAChC;aAEA,0CAAoB,GAAG,CAAC;IAE5B;AACF","sources":["packages/@react-aria/utils/src/runAfterTransition.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\n// We store a global list of elements that are currently transitioning,\n// mapped to a set of CSS properties that are transitioning for that element.\n// This is necessary rather than a simple count of transitions because of browser\n// bugs, e.g. Chrome sometimes fires both transitionend and transitioncancel rather\n// than one or the other. So we need to track what's actually transitioning so that\n// we can ignore these duplicate events.\nimport {getEventTarget} from './shadowdom/DOMFunctions';\nlet transitionsByElement = new Map<EventTarget, Set<string>>();\n\n// A list of callbacks to call once there are no transitioning elements.\nlet transitionCallbacks = new Set<() => void>();\n\nfunction setupGlobalEvents() {\n if (typeof window === 'undefined') {\n return;\n }\n\n function isTransitionEvent(event: Event): event is TransitionEvent {\n return 'propertyName' in event;\n }\n\n let onTransitionStart = (e: Event) => {\n let eventTarget = getEventTarget(e);\n if (!isTransitionEvent(e) || !eventTarget) {\n return;\n }\n // Add the transitioning property to the list for this element.\n let transitions = transitionsByElement.get(eventTarget);\n if (!transitions) {\n transitions = new Set();\n transitionsByElement.set(eventTarget, transitions);\n\n // The transitioncancel event must be registered on the element itself, rather than as a global\n // event. This enables us to handle when the node is deleted from the document while it is transitioning.\n // In that case, the cancel event would have nowhere to bubble to so we need to handle it directly.\n eventTarget.addEventListener('transitioncancel', onTransitionEnd, {\n once: true\n });\n }\n\n transitions.add(e.propertyName);\n };\n\n let onTransitionEnd = (e: Event) => {\n let eventTarget = getEventTarget(e);\n if (!isTransitionEvent(e) || !eventTarget) {\n return;\n }\n // Remove property from list of transitioning properties.\n let properties = transitionsByElement.get(eventTarget);\n if (!properties) {\n return;\n }\n\n properties.delete(e.propertyName);\n\n // If empty, remove transitioncancel event, and remove the element from the list of transitioning elements.\n if (properties.size === 0) {\n eventTarget.removeEventListener('transitioncancel', onTransitionEnd);\n transitionsByElement.delete(eventTarget);\n }\n\n // If no transitioning elements, call all of the queued callbacks.\n if (transitionsByElement.size === 0) {\n for (let cb of transitionCallbacks) {\n cb();\n }\n\n transitionCallbacks.clear();\n }\n };\n\n document.body.addEventListener('transitionrun', onTransitionStart);\n document.body.addEventListener('transitionend', onTransitionEnd);\n}\n\nif (typeof document !== 'undefined') {\n if (document.readyState !== 'loading') {\n setupGlobalEvents();\n } else {\n document.addEventListener('DOMContentLoaded', setupGlobalEvents);\n }\n}\n\n/**\n * Cleans up any elements that are no longer in the document.\n * This is necessary because we can't rely on transitionend events to fire\n * for elements that are removed from the document while transitioning.\n */\nfunction cleanupDetachedElements() {\n for (const [eventTarget] of transitionsByElement) {\n // Similar to `eventTarget instanceof Element && !eventTarget.isConnected`, but avoids\n // the explicit instanceof check, since it may be different in different contexts.\n if ('isConnected' in eventTarget && !eventTarget.isConnected) {\n transitionsByElement.delete(eventTarget);\n }\n }\n}\n\nexport function runAfterTransition(fn: () => void): void {\n // Wait one frame to see if an animation starts, e.g. a transition on mount.\n requestAnimationFrame(() => {\n cleanupDetachedElements();\n // If no transitions are running, call the function immediately.\n // Otherwise, add it to a list of callbacks to run at the end of the animation.\n if (transitionsByElement.size === 0) {\n fn();\n } else {\n transitionCallbacks.add(fn);\n }\n });\n}\n"],"names":[],"version":3,"file":"runAfterTransition.module.js.map"}
@@ -1,5 +1,5 @@
1
1
  var $49f0d9486c2408aa$exports = require("./getScrollParents.main.js");
2
- var $d723bea02f3e2567$exports = require("./DOMFunctions.main.js");
2
+ var $9e20cff0af27e8cc$exports = require("./platform.main.js");
3
3
 
4
4
 
5
5
  function $parcel$export(e, n, v, s) {
@@ -20,59 +20,83 @@ $parcel$export(module.exports, "scrollIntoViewport", () => $449412113267a1fe$exp
20
20
  * governing permissions and limitations under the License.
21
21
  */
22
22
 
23
- function $449412113267a1fe$export$53a0910f038337bd(scrollView, element) {
24
- let offsetX = $449412113267a1fe$var$relativeOffset(scrollView, element, 'left');
25
- let offsetY = $449412113267a1fe$var$relativeOffset(scrollView, element, 'top');
26
- let width = element.offsetWidth;
27
- let height = element.offsetHeight;
28
- let x = scrollView.scrollLeft;
23
+ function $449412113267a1fe$export$53a0910f038337bd(scrollView, element, opts = {}) {
24
+ let { block: block = 'nearest', inline: inline = 'nearest' } = opts;
25
+ if (scrollView === element) return;
29
26
  let y = scrollView.scrollTop;
30
- // Account for top/left border offsetting the scroll top/Left + scroll padding
31
- let { borderTopWidth: borderTopWidth, borderLeftWidth: borderLeftWidth, scrollPaddingTop: scrollPaddingTop, scrollPaddingRight: scrollPaddingRight, scrollPaddingBottom: scrollPaddingBottom, scrollPaddingLeft: scrollPaddingLeft } = getComputedStyle(scrollView);
32
- let borderAdjustedX = x + parseInt(borderLeftWidth, 10);
33
- let borderAdjustedY = y + parseInt(borderTopWidth, 10);
34
- // Ignore end/bottom border via clientHeight/Width instead of offsetHeight/Width
35
- let maxX = borderAdjustedX + scrollView.clientWidth;
36
- let maxY = borderAdjustedY + scrollView.clientHeight;
37
- // Get scroll padding values as pixels - defaults to 0 if no scroll padding
38
- // is used.
39
- let scrollPaddingTopNumber = parseInt(scrollPaddingTop, 10) || 0;
40
- let scrollPaddingBottomNumber = parseInt(scrollPaddingBottom, 10) || 0;
41
- let scrollPaddingRightNumber = parseInt(scrollPaddingRight, 10) || 0;
42
- let scrollPaddingLeftNumber = parseInt(scrollPaddingLeft, 10) || 0;
43
- if (offsetX <= x + scrollPaddingLeftNumber) x = offsetX - parseInt(borderLeftWidth, 10) - scrollPaddingLeftNumber;
44
- else if (offsetX + width > maxX - scrollPaddingRightNumber) x += offsetX + width - maxX + scrollPaddingRightNumber;
45
- if (offsetY <= borderAdjustedY + scrollPaddingTopNumber) y = offsetY - parseInt(borderTopWidth, 10) - scrollPaddingTopNumber;
46
- else if (offsetY + height > maxY - scrollPaddingBottomNumber) y += offsetY + height - maxY + scrollPaddingBottomNumber;
47
- scrollView.scrollLeft = x;
48
- scrollView.scrollTop = y;
49
- }
50
- /**
51
- * Computes the offset left or top from child to ancestor by accumulating
52
- * offsetLeft or offsetTop through intervening offsetParents.
53
- */ function $449412113267a1fe$var$relativeOffset(ancestor, child, axis) {
54
- const prop = axis === 'left' ? 'offsetLeft' : 'offsetTop';
55
- let sum = 0;
56
- while(child.offsetParent){
57
- sum += child[prop];
58
- if (child.offsetParent === ancestor) break;
59
- else if ((0, $d723bea02f3e2567$exports.nodeContains)(child.offsetParent, ancestor)) {
60
- // If the ancestor is not `position:relative`, then we stop at
61
- // _its_ offset parent, and we subtract off _its_ offset, so that
62
- // we end up with the proper offset from child to ancestor.
63
- sum -= ancestor[prop];
64
- break;
65
- }
66
- child = child.offsetParent;
27
+ let x = scrollView.scrollLeft;
28
+ let target = element.getBoundingClientRect();
29
+ let view = scrollView.getBoundingClientRect();
30
+ let itemStyle = window.getComputedStyle(element);
31
+ let viewStyle = window.getComputedStyle(scrollView);
32
+ let root = document.scrollingElement || document.documentElement;
33
+ let viewTop = scrollView === root ? 0 : view.top;
34
+ let viewBottom = scrollView === root ? scrollView.clientHeight : view.bottom;
35
+ let viewLeft = scrollView === root ? 0 : view.left;
36
+ let viewRight = scrollView === root ? scrollView.clientWidth : view.right;
37
+ let scrollMarginTop = parseInt(itemStyle.scrollMarginTop, 10) || 0;
38
+ let scrollMarginBottom = parseInt(itemStyle.scrollMarginBottom, 10) || 0;
39
+ let scrollMarginLeft = parseInt(itemStyle.scrollMarginLeft, 10) || 0;
40
+ let scrollMarginRight = parseInt(itemStyle.scrollMarginRight, 10) || 0;
41
+ let scrollPaddingTop = parseInt(viewStyle.scrollPaddingTop, 10) || 0;
42
+ let scrollPaddingBottom = parseInt(viewStyle.scrollPaddingBottom, 10) || 0;
43
+ let scrollPaddingLeft = parseInt(viewStyle.scrollPaddingLeft, 10) || 0;
44
+ let scrollPaddingRight = parseInt(viewStyle.scrollPaddingRight, 10) || 0;
45
+ let borderTopWidth = parseInt(viewStyle.borderTopWidth, 10) || 0;
46
+ let borderBottomWidth = parseInt(viewStyle.borderBottomWidth, 10) || 0;
47
+ let borderLeftWidth = parseInt(viewStyle.borderLeftWidth, 10) || 0;
48
+ let borderRightWidth = parseInt(viewStyle.borderRightWidth, 10) || 0;
49
+ let scrollAreaTop = target.top - scrollMarginTop;
50
+ let scrollAreaBottom = target.bottom + scrollMarginBottom;
51
+ let scrollAreaLeft = target.left - scrollMarginLeft;
52
+ let scrollAreaRight = target.right + scrollMarginRight;
53
+ let scrollBarOffsetX = scrollView === root ? 0 : borderLeftWidth + borderRightWidth;
54
+ let scrollBarOffsetY = scrollView === root ? 0 : borderTopWidth + borderBottomWidth;
55
+ let scrollBarWidth = scrollView.offsetWidth - scrollView.clientWidth - scrollBarOffsetX;
56
+ let scrollBarHeight = scrollView.offsetHeight - scrollView.clientHeight - scrollBarOffsetY;
57
+ let scrollPortTop = viewTop + borderTopWidth + scrollPaddingTop;
58
+ let scrollPortBottom = viewBottom - borderBottomWidth - scrollPaddingBottom - scrollBarHeight;
59
+ let scrollPortLeft = viewLeft + borderLeftWidth + scrollPaddingLeft;
60
+ let scrollPortRight = viewRight - borderRightWidth - scrollPaddingRight;
61
+ // IOS always positions the scrollbar on the right ¯\_(ツ)_/¯
62
+ if (viewStyle.direction === 'rtl' && !(0, $9e20cff0af27e8cc$exports.isIOS)()) scrollPortLeft += scrollBarWidth;
63
+ else scrollPortRight -= scrollBarWidth;
64
+ let shouldScrollBlock = scrollAreaTop < scrollPortTop || scrollAreaBottom > scrollPortBottom;
65
+ let shouldScrollInline = scrollAreaLeft < scrollPortLeft || scrollAreaRight > scrollPortRight;
66
+ if (shouldScrollBlock && block === 'start') y += scrollAreaTop - scrollPortTop;
67
+ else if (shouldScrollBlock && block === 'center') y += (scrollAreaTop + scrollAreaBottom) / 2 - (scrollPortTop + scrollPortBottom) / 2;
68
+ else if (shouldScrollBlock && block === 'end') y += scrollAreaBottom - scrollPortBottom;
69
+ else if (shouldScrollBlock && block === 'nearest') {
70
+ let start = scrollAreaTop - scrollPortTop;
71
+ let end = scrollAreaBottom - scrollPortBottom;
72
+ y += Math.abs(start) <= Math.abs(end) ? start : end;
67
73
  }
68
- return sum;
74
+ if (shouldScrollInline && inline === 'start') x += scrollAreaLeft - scrollPortLeft;
75
+ else if (shouldScrollInline && inline === 'center') x += (scrollAreaLeft + scrollAreaRight) / 2 - (scrollPortLeft + scrollPortRight) / 2;
76
+ else if (shouldScrollInline && inline === 'end') x += scrollAreaRight - scrollPortRight;
77
+ else if (shouldScrollInline && inline === 'nearest') {
78
+ let start = scrollAreaLeft - scrollPortLeft;
79
+ let end = scrollAreaRight - scrollPortRight;
80
+ x += Math.abs(start) <= Math.abs(end) ? start : end;
81
+ }
82
+ if (process.env.NODE_ENV === 'test') {
83
+ scrollView.scrollLeft = x;
84
+ scrollView.scrollTop = y;
85
+ return;
86
+ }
87
+ scrollView.scrollTo({
88
+ left: x,
89
+ top: y
90
+ });
69
91
  }
70
- function $449412113267a1fe$export$c826860796309d1b(targetElement, opts) {
71
- if (targetElement && (0, $d723bea02f3e2567$exports.nodeContains)(document, targetElement)) {
92
+ function $449412113267a1fe$export$c826860796309d1b(targetElement, opts = {}) {
93
+ let { containingElement: containingElement } = opts;
94
+ if (targetElement && targetElement.isConnected) {
72
95
  let root = document.scrollingElement || document.documentElement;
73
96
  let isScrollPrevented = window.getComputedStyle(root).overflow === 'hidden';
74
- // If scrolling is not currently prevented then we arent in a overlay nor is a overlay open, just use element.scrollIntoView to bring the element into view
75
- if (!isScrollPrevented) {
97
+ // If scrolling is not currently prevented then we aren't in a overlay nor is a overlay open, just use element.scrollIntoView to bring the element into view
98
+ // Also ignore in chrome because of this bug: https://issues.chromium.org/issues/40074749
99
+ if (!isScrollPrevented && !(0, $9e20cff0af27e8cc$exports.isChrome)()) {
76
100
  var // use scrollIntoView({block: 'nearest'}) instead of .focus to check if the element is fully in view or not since .focus()
77
101
  // won't cause a scroll if the element is already focused and doesn't behave consistently when an element is partially out of view horizontally vs vertically
78
102
  _targetElement_scrollIntoView;
@@ -83,8 +107,8 @@ function $449412113267a1fe$export$c826860796309d1b(targetElement, opts) {
83
107
  let { left: newLeft, top: newTop } = targetElement.getBoundingClientRect();
84
108
  // Account for sub pixel differences from rounding
85
109
  if (Math.abs(originalLeft - newLeft) > 1 || Math.abs(originalTop - newTop) > 1) {
86
- var _opts_containingElement_scrollIntoView, _opts_containingElement, _targetElement_scrollIntoView1;
87
- opts === null || opts === void 0 ? void 0 : (_opts_containingElement = opts.containingElement) === null || _opts_containingElement === void 0 ? void 0 : (_opts_containingElement_scrollIntoView = _opts_containingElement.scrollIntoView) === null || _opts_containingElement_scrollIntoView === void 0 ? void 0 : _opts_containingElement_scrollIntoView.call(_opts_containingElement, {
110
+ var _containingElement_scrollIntoView, _targetElement_scrollIntoView1;
111
+ containingElement === null || containingElement === void 0 ? void 0 : (_containingElement_scrollIntoView = containingElement.scrollIntoView) === null || _containingElement_scrollIntoView === void 0 ? void 0 : _containingElement_scrollIntoView.call(containingElement, {
88
112
  block: 'center',
89
113
  inline: 'center'
90
114
  });
@@ -93,10 +117,19 @@ function $449412113267a1fe$export$c826860796309d1b(targetElement, opts) {
93
117
  });
94
118
  }
95
119
  } else {
96
- let scrollParents = (0, $49f0d9486c2408aa$exports.getScrollParents)(targetElement);
120
+ let { left: originalLeft, top: originalTop } = targetElement.getBoundingClientRect();
97
121
  // If scrolling is prevented, we don't want to scroll the body since it might move the overlay partially offscreen and the user can't scroll it back into view.
98
- if (!isScrollPrevented) scrollParents.push(root);
122
+ let scrollParents = (0, $49f0d9486c2408aa$exports.getScrollParents)(targetElement, true);
99
123
  for (let scrollParent of scrollParents)$449412113267a1fe$export$53a0910f038337bd(scrollParent, targetElement);
124
+ let { left: newLeft, top: newTop } = targetElement.getBoundingClientRect();
125
+ // Account for sub pixel differences from rounding
126
+ if (Math.abs(originalLeft - newLeft) > 1 || Math.abs(originalTop - newTop) > 1) {
127
+ scrollParents = containingElement ? (0, $49f0d9486c2408aa$exports.getScrollParents)(containingElement, true) : [];
128
+ for (let scrollParent of scrollParents)$449412113267a1fe$export$53a0910f038337bd(scrollParent, containingElement, {
129
+ block: 'center',
130
+ inline: 'center'
131
+ });
132
+ }
100
133
  }
101
134
  }
102
135
  }
@@ -1 +1 @@
1
- {"mappings":"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","sources":["packages/@react-aria/utils/src/scrollIntoView.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {getScrollParents} from './getScrollParents';\nimport {nodeContains} from './shadowdom/DOMFunctions';\n\ninterface ScrollIntoViewportOpts {\n /** The optional containing element of the target to be centered in the viewport. */\n containingElement?: Element | null\n}\n\n/**\n * Scrolls `scrollView` so that `element` is visible.\n * Similar to `element.scrollIntoView({block: 'nearest'})` (not supported in Edge),\n * but doesn't affect parents above `scrollView`.\n */\nexport function scrollIntoView(scrollView: HTMLElement, element: HTMLElement): void {\n let offsetX = relativeOffset(scrollView, element, 'left');\n let offsetY = relativeOffset(scrollView, element, 'top');\n let width = element.offsetWidth;\n let height = element.offsetHeight;\n let x = scrollView.scrollLeft;\n let y = scrollView.scrollTop;\n\n // Account for top/left border offsetting the scroll top/Left + scroll padding\n let {\n borderTopWidth,\n borderLeftWidth,\n scrollPaddingTop,\n scrollPaddingRight,\n scrollPaddingBottom,\n scrollPaddingLeft\n } = getComputedStyle(scrollView);\n\n let borderAdjustedX = x + parseInt(borderLeftWidth, 10);\n let borderAdjustedY = y + parseInt(borderTopWidth, 10);\n // Ignore end/bottom border via clientHeight/Width instead of offsetHeight/Width\n let maxX = borderAdjustedX + scrollView.clientWidth;\n let maxY = borderAdjustedY + scrollView.clientHeight;\n\n // Get scroll padding values as pixels - defaults to 0 if no scroll padding\n // is used.\n let scrollPaddingTopNumber = parseInt(scrollPaddingTop, 10) || 0;\n let scrollPaddingBottomNumber = parseInt(scrollPaddingBottom, 10) || 0;\n let scrollPaddingRightNumber = parseInt(scrollPaddingRight, 10) || 0;\n let scrollPaddingLeftNumber = parseInt(scrollPaddingLeft, 10) || 0;\n\n if (offsetX <= x + scrollPaddingLeftNumber) {\n x = offsetX - parseInt(borderLeftWidth, 10) - scrollPaddingLeftNumber;\n } else if (offsetX + width > maxX - scrollPaddingRightNumber) {\n x += offsetX + width - maxX + scrollPaddingRightNumber;\n }\n if (offsetY <= borderAdjustedY + scrollPaddingTopNumber) {\n y = offsetY - parseInt(borderTopWidth, 10) - scrollPaddingTopNumber;\n } else if (offsetY + height > maxY - scrollPaddingBottomNumber) {\n y += offsetY + height - maxY + scrollPaddingBottomNumber;\n }\n\n scrollView.scrollLeft = x;\n scrollView.scrollTop = y;\n}\n\n/**\n * Computes the offset left or top from child to ancestor by accumulating\n * offsetLeft or offsetTop through intervening offsetParents.\n */\nfunction relativeOffset(ancestor: HTMLElement, child: HTMLElement, axis: 'left'|'top') {\n const prop = axis === 'left' ? 'offsetLeft' : 'offsetTop';\n let sum = 0;\n while (child.offsetParent) {\n sum += child[prop];\n if (child.offsetParent === ancestor) {\n // Stop once we have found the ancestor we are interested in.\n break;\n } else if (nodeContains(child.offsetParent, ancestor)) {\n // If the ancestor is not `position:relative`, then we stop at\n // _its_ offset parent, and we subtract off _its_ offset, so that\n // we end up with the proper offset from child to ancestor.\n sum -= ancestor[prop];\n break;\n }\n child = child.offsetParent as HTMLElement;\n }\n return sum;\n}\n\n/**\n * Scrolls the `targetElement` so it is visible in the viewport. Accepts an optional `opts.containingElement`\n * that will be centered in the viewport prior to scrolling the targetElement into view. If scrolling is prevented on\n * the body (e.g. targetElement is in a popover), this will only scroll the scroll parents of the targetElement up to but not including the body itself.\n */\nexport function scrollIntoViewport(targetElement: Element | null, opts?: ScrollIntoViewportOpts): void {\n if (targetElement && nodeContains(document, targetElement)) {\n let root = document.scrollingElement || document.documentElement;\n let isScrollPrevented = window.getComputedStyle(root).overflow === 'hidden';\n // If scrolling is not currently prevented then we aren’t in a overlay nor is a overlay open, just use element.scrollIntoView to bring the element into view\n if (!isScrollPrevented) {\n let {left: originalLeft, top: originalTop} = targetElement.getBoundingClientRect();\n\n // use scrollIntoView({block: 'nearest'}) instead of .focus to check if the element is fully in view or not since .focus()\n // won't cause a scroll if the element is already focused and doesn't behave consistently when an element is partially out of view horizontally vs vertically\n targetElement?.scrollIntoView?.({block: 'nearest'});\n let {left: newLeft, top: newTop} = targetElement.getBoundingClientRect();\n // Account for sub pixel differences from rounding\n if ((Math.abs(originalLeft - newLeft) > 1) || (Math.abs(originalTop - newTop) > 1)) {\n opts?.containingElement?.scrollIntoView?.({block: 'center', inline: 'center'});\n targetElement.scrollIntoView?.({block: 'nearest'});\n }\n } else {\n let scrollParents = getScrollParents(targetElement);\n // If scrolling is prevented, we don't want to scroll the body since it might move the overlay partially offscreen and the user can't scroll it back into view.\n if (!isScrollPrevented) {\n scrollParents.push(root);\n }\n for (let scrollParent of scrollParents) {\n scrollIntoView(scrollParent as HTMLElement, targetElement as HTMLElement);\n }\n }\n }\n}\n"],"names":[],"version":3,"file":"scrollIntoView.main.js.map"}
1
+ {"mappings":"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","sources":["packages/@react-aria/utils/src/scrollIntoView.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {getScrollParents} from './getScrollParents';\nimport {isChrome, isIOS} from './platform';\n\ninterface ScrollIntoViewOpts {\n /** The position to align items along the block axis in. */\n block?: ScrollLogicalPosition,\n /** The position to align items along the inline axis in. */\n inline?: ScrollLogicalPosition\n}\n\n\ninterface ScrollIntoViewportOpts {\n /** The optional containing element of the target to be centered in the viewport. */\n containingElement?: Element | null\n}\n\n/**\n * Scrolls `scrollView` so that `element` is visible.\n * Similar to `element.scrollIntoView({block: 'nearest'})` (not supported in Edge),\n * but doesn't affect parents above `scrollView`.\n */\nexport function scrollIntoView(scrollView: HTMLElement, element: HTMLElement, opts: ScrollIntoViewOpts = {}): void {\n let {block = 'nearest', inline = 'nearest'} = opts;\n\n if (scrollView === element) { return; }\n\n let y = scrollView.scrollTop;\n let x = scrollView.scrollLeft;\n\n let target = element.getBoundingClientRect();\n let view = scrollView.getBoundingClientRect();\n let itemStyle = window.getComputedStyle(element);\n let viewStyle = window.getComputedStyle(scrollView);\n let root = document.scrollingElement || document.documentElement;\n\n let viewTop = scrollView === root ? 0 : view.top;\n let viewBottom = scrollView === root ? scrollView.clientHeight : view.bottom;\n let viewLeft = scrollView === root ? 0 : view.left;\n let viewRight = scrollView === root ? scrollView.clientWidth : view.right;\n\n let scrollMarginTop = parseInt(itemStyle.scrollMarginTop, 10) || 0;\n let scrollMarginBottom = parseInt(itemStyle.scrollMarginBottom, 10) || 0;\n let scrollMarginLeft = parseInt(itemStyle.scrollMarginLeft, 10) || 0;\n let scrollMarginRight = parseInt(itemStyle.scrollMarginRight, 10) || 0;\n\n let scrollPaddingTop = parseInt(viewStyle.scrollPaddingTop, 10) || 0;\n let scrollPaddingBottom = parseInt(viewStyle.scrollPaddingBottom, 10) || 0;\n let scrollPaddingLeft = parseInt(viewStyle.scrollPaddingLeft, 10) || 0;\n let scrollPaddingRight = parseInt(viewStyle.scrollPaddingRight, 10) || 0;\n\n let borderTopWidth = parseInt(viewStyle.borderTopWidth, 10) || 0;\n let borderBottomWidth = parseInt(viewStyle.borderBottomWidth, 10) || 0;\n let borderLeftWidth = parseInt(viewStyle.borderLeftWidth, 10) || 0;\n let borderRightWidth = parseInt(viewStyle.borderRightWidth, 10) || 0;\n\n let scrollAreaTop = target.top - scrollMarginTop;\n let scrollAreaBottom = target.bottom + scrollMarginBottom;\n let scrollAreaLeft = target.left - scrollMarginLeft;\n let scrollAreaRight = target.right + scrollMarginRight;\n\n let scrollBarOffsetX = scrollView === root ? 0 : borderLeftWidth + borderRightWidth;\n let scrollBarOffsetY = scrollView === root ? 0 : borderTopWidth + borderBottomWidth;\n let scrollBarWidth = scrollView.offsetWidth - scrollView.clientWidth - scrollBarOffsetX;\n let scrollBarHeight = scrollView.offsetHeight - scrollView.clientHeight - scrollBarOffsetY;\n\n let scrollPortTop = viewTop + borderTopWidth + scrollPaddingTop;\n let scrollPortBottom = viewBottom - borderBottomWidth - scrollPaddingBottom - scrollBarHeight;\n let scrollPortLeft = viewLeft + borderLeftWidth + scrollPaddingLeft;\n let scrollPortRight = viewRight - borderRightWidth - scrollPaddingRight;\n\n // IOS always positions the scrollbar on the right ¯\\_(ツ)_/¯\n if (viewStyle.direction === 'rtl' && !isIOS()) {\n scrollPortLeft += scrollBarWidth;\n } else {\n scrollPortRight -= scrollBarWidth;\n }\n\n let shouldScrollBlock = scrollAreaTop < scrollPortTop || scrollAreaBottom > scrollPortBottom;\n let shouldScrollInline = scrollAreaLeft < scrollPortLeft || scrollAreaRight > scrollPortRight;\n\n if (shouldScrollBlock && block === 'start') {\n y += scrollAreaTop - scrollPortTop;\n } else if (shouldScrollBlock && block === 'center') {\n y += (scrollAreaTop + scrollAreaBottom) / 2 - (scrollPortTop + scrollPortBottom) / 2;\n } else if (shouldScrollBlock && block === 'end') {\n y += scrollAreaBottom - scrollPortBottom;\n } else if (shouldScrollBlock && block === 'nearest') {\n let start = scrollAreaTop - scrollPortTop;\n let end = scrollAreaBottom - scrollPortBottom;\n y += Math.abs(start) <= Math.abs(end) ? start : end;\n }\n\n if (shouldScrollInline && inline === 'start') {\n x += scrollAreaLeft - scrollPortLeft;\n } else if (shouldScrollInline && inline === 'center') {\n x += (scrollAreaLeft + scrollAreaRight) / 2 - (scrollPortLeft + scrollPortRight) / 2;\n } else if (shouldScrollInline && inline === 'end') {\n x += scrollAreaRight - scrollPortRight;\n } else if (shouldScrollInline && inline === 'nearest') {\n let start = scrollAreaLeft - scrollPortLeft;\n let end = scrollAreaRight - scrollPortRight;\n x += Math.abs(start) <= Math.abs(end) ? start : end;\n }\n\n if (process.env.NODE_ENV === 'test') {\n scrollView.scrollLeft = x;\n scrollView.scrollTop = y;\n return;\n }\n\n scrollView.scrollTo({left: x, top: y});\n}\n\n/**\n * Scrolls the `targetElement` so it is visible in the viewport. Accepts an optional `opts.containingElement`\n * that will be centered in the viewport prior to scrolling the targetElement into view. If scrolling is prevented on\n * the body (e.g. targetElement is in a popover), this will only scroll the scroll parents of the targetElement up to but not including the body itself.\n */\nexport function scrollIntoViewport(targetElement: Element | null, opts: ScrollIntoViewportOpts = {}): void {\n let {containingElement} = opts;\n if (targetElement && targetElement.isConnected) {\n let root = document.scrollingElement || document.documentElement;\n let isScrollPrevented = window.getComputedStyle(root).overflow === 'hidden';\n // If scrolling is not currently prevented then we aren't in a overlay nor is a overlay open, just use element.scrollIntoView to bring the element into view\n // Also ignore in chrome because of this bug: https://issues.chromium.org/issues/40074749\n if (!isScrollPrevented && !isChrome()) {\n let {left: originalLeft, top: originalTop} = targetElement.getBoundingClientRect();\n\n // use scrollIntoView({block: 'nearest'}) instead of .focus to check if the element is fully in view or not since .focus()\n // won't cause a scroll if the element is already focused and doesn't behave consistently when an element is partially out of view horizontally vs vertically\n targetElement?.scrollIntoView?.({block: 'nearest'});\n let {left: newLeft, top: newTop} = targetElement.getBoundingClientRect();\n // Account for sub pixel differences from rounding\n if ((Math.abs(originalLeft - newLeft) > 1) || (Math.abs(originalTop - newTop) > 1)) {\n containingElement?.scrollIntoView?.({block: 'center', inline: 'center'});\n targetElement.scrollIntoView?.({block: 'nearest'});\n }\n } else {\n let {left: originalLeft, top: originalTop} = targetElement.getBoundingClientRect();\n\n // If scrolling is prevented, we don't want to scroll the body since it might move the overlay partially offscreen and the user can't scroll it back into view.\n let scrollParents = getScrollParents(targetElement, true);\n for (let scrollParent of scrollParents) {\n scrollIntoView(scrollParent as HTMLElement, targetElement as HTMLElement);\n }\n let {left: newLeft, top: newTop} = targetElement.getBoundingClientRect();\n // Account for sub pixel differences from rounding\n if ((Math.abs(originalLeft - newLeft) > 1) || (Math.abs(originalTop - newTop) > 1)) {\n scrollParents = containingElement ? getScrollParents(containingElement, true) : [];\n for (let scrollParent of scrollParents) {\n scrollIntoView(scrollParent as HTMLElement, containingElement as HTMLElement, {block: 'center', inline: 'center'});\n }\n }\n }\n }\n}\n"],"names":[],"version":3,"file":"scrollIntoView.main.js.map"}
@@ -1,5 +1,5 @@
1
1
  import {getScrollParents as $a40c673dc9f6d9c7$export$94ed1c92c7beeb22} from "./getScrollParents.mjs";
2
- import {nodeContains as $d4ee10de306f2510$export$4282f70798064fe0} from "./DOMFunctions.mjs";
2
+ import {isChrome as $c87311424ea30a05$export$6446a186d09e379e, isIOS as $c87311424ea30a05$export$fedb369cb70207f1} from "./platform.mjs";
3
3
 
4
4
  /*
5
5
  * Copyright 2020 Adobe. All rights reserved.
@@ -13,59 +13,83 @@ import {nodeContains as $d4ee10de306f2510$export$4282f70798064fe0} from "./DOMFu
13
13
  * governing permissions and limitations under the License.
14
14
  */
15
15
 
16
- function $2f04cbc44ee30ce0$export$53a0910f038337bd(scrollView, element) {
17
- let offsetX = $2f04cbc44ee30ce0$var$relativeOffset(scrollView, element, 'left');
18
- let offsetY = $2f04cbc44ee30ce0$var$relativeOffset(scrollView, element, 'top');
19
- let width = element.offsetWidth;
20
- let height = element.offsetHeight;
21
- let x = scrollView.scrollLeft;
16
+ function $2f04cbc44ee30ce0$export$53a0910f038337bd(scrollView, element, opts = {}) {
17
+ let { block: block = 'nearest', inline: inline = 'nearest' } = opts;
18
+ if (scrollView === element) return;
22
19
  let y = scrollView.scrollTop;
23
- // Account for top/left border offsetting the scroll top/Left + scroll padding
24
- let { borderTopWidth: borderTopWidth, borderLeftWidth: borderLeftWidth, scrollPaddingTop: scrollPaddingTop, scrollPaddingRight: scrollPaddingRight, scrollPaddingBottom: scrollPaddingBottom, scrollPaddingLeft: scrollPaddingLeft } = getComputedStyle(scrollView);
25
- let borderAdjustedX = x + parseInt(borderLeftWidth, 10);
26
- let borderAdjustedY = y + parseInt(borderTopWidth, 10);
27
- // Ignore end/bottom border via clientHeight/Width instead of offsetHeight/Width
28
- let maxX = borderAdjustedX + scrollView.clientWidth;
29
- let maxY = borderAdjustedY + scrollView.clientHeight;
30
- // Get scroll padding values as pixels - defaults to 0 if no scroll padding
31
- // is used.
32
- let scrollPaddingTopNumber = parseInt(scrollPaddingTop, 10) || 0;
33
- let scrollPaddingBottomNumber = parseInt(scrollPaddingBottom, 10) || 0;
34
- let scrollPaddingRightNumber = parseInt(scrollPaddingRight, 10) || 0;
35
- let scrollPaddingLeftNumber = parseInt(scrollPaddingLeft, 10) || 0;
36
- if (offsetX <= x + scrollPaddingLeftNumber) x = offsetX - parseInt(borderLeftWidth, 10) - scrollPaddingLeftNumber;
37
- else if (offsetX + width > maxX - scrollPaddingRightNumber) x += offsetX + width - maxX + scrollPaddingRightNumber;
38
- if (offsetY <= borderAdjustedY + scrollPaddingTopNumber) y = offsetY - parseInt(borderTopWidth, 10) - scrollPaddingTopNumber;
39
- else if (offsetY + height > maxY - scrollPaddingBottomNumber) y += offsetY + height - maxY + scrollPaddingBottomNumber;
40
- scrollView.scrollLeft = x;
41
- scrollView.scrollTop = y;
42
- }
43
- /**
44
- * Computes the offset left or top from child to ancestor by accumulating
45
- * offsetLeft or offsetTop through intervening offsetParents.
46
- */ function $2f04cbc44ee30ce0$var$relativeOffset(ancestor, child, axis) {
47
- const prop = axis === 'left' ? 'offsetLeft' : 'offsetTop';
48
- let sum = 0;
49
- while(child.offsetParent){
50
- sum += child[prop];
51
- if (child.offsetParent === ancestor) break;
52
- else if ((0, $d4ee10de306f2510$export$4282f70798064fe0)(child.offsetParent, ancestor)) {
53
- // If the ancestor is not `position:relative`, then we stop at
54
- // _its_ offset parent, and we subtract off _its_ offset, so that
55
- // we end up with the proper offset from child to ancestor.
56
- sum -= ancestor[prop];
57
- break;
58
- }
59
- child = child.offsetParent;
20
+ let x = scrollView.scrollLeft;
21
+ let target = element.getBoundingClientRect();
22
+ let view = scrollView.getBoundingClientRect();
23
+ let itemStyle = window.getComputedStyle(element);
24
+ let viewStyle = window.getComputedStyle(scrollView);
25
+ let root = document.scrollingElement || document.documentElement;
26
+ let viewTop = scrollView === root ? 0 : view.top;
27
+ let viewBottom = scrollView === root ? scrollView.clientHeight : view.bottom;
28
+ let viewLeft = scrollView === root ? 0 : view.left;
29
+ let viewRight = scrollView === root ? scrollView.clientWidth : view.right;
30
+ let scrollMarginTop = parseInt(itemStyle.scrollMarginTop, 10) || 0;
31
+ let scrollMarginBottom = parseInt(itemStyle.scrollMarginBottom, 10) || 0;
32
+ let scrollMarginLeft = parseInt(itemStyle.scrollMarginLeft, 10) || 0;
33
+ let scrollMarginRight = parseInt(itemStyle.scrollMarginRight, 10) || 0;
34
+ let scrollPaddingTop = parseInt(viewStyle.scrollPaddingTop, 10) || 0;
35
+ let scrollPaddingBottom = parseInt(viewStyle.scrollPaddingBottom, 10) || 0;
36
+ let scrollPaddingLeft = parseInt(viewStyle.scrollPaddingLeft, 10) || 0;
37
+ let scrollPaddingRight = parseInt(viewStyle.scrollPaddingRight, 10) || 0;
38
+ let borderTopWidth = parseInt(viewStyle.borderTopWidth, 10) || 0;
39
+ let borderBottomWidth = parseInt(viewStyle.borderBottomWidth, 10) || 0;
40
+ let borderLeftWidth = parseInt(viewStyle.borderLeftWidth, 10) || 0;
41
+ let borderRightWidth = parseInt(viewStyle.borderRightWidth, 10) || 0;
42
+ let scrollAreaTop = target.top - scrollMarginTop;
43
+ let scrollAreaBottom = target.bottom + scrollMarginBottom;
44
+ let scrollAreaLeft = target.left - scrollMarginLeft;
45
+ let scrollAreaRight = target.right + scrollMarginRight;
46
+ let scrollBarOffsetX = scrollView === root ? 0 : borderLeftWidth + borderRightWidth;
47
+ let scrollBarOffsetY = scrollView === root ? 0 : borderTopWidth + borderBottomWidth;
48
+ let scrollBarWidth = scrollView.offsetWidth - scrollView.clientWidth - scrollBarOffsetX;
49
+ let scrollBarHeight = scrollView.offsetHeight - scrollView.clientHeight - scrollBarOffsetY;
50
+ let scrollPortTop = viewTop + borderTopWidth + scrollPaddingTop;
51
+ let scrollPortBottom = viewBottom - borderBottomWidth - scrollPaddingBottom - scrollBarHeight;
52
+ let scrollPortLeft = viewLeft + borderLeftWidth + scrollPaddingLeft;
53
+ let scrollPortRight = viewRight - borderRightWidth - scrollPaddingRight;
54
+ // IOS always positions the scrollbar on the right ¯\_(ツ)_/¯
55
+ if (viewStyle.direction === 'rtl' && !(0, $c87311424ea30a05$export$fedb369cb70207f1)()) scrollPortLeft += scrollBarWidth;
56
+ else scrollPortRight -= scrollBarWidth;
57
+ let shouldScrollBlock = scrollAreaTop < scrollPortTop || scrollAreaBottom > scrollPortBottom;
58
+ let shouldScrollInline = scrollAreaLeft < scrollPortLeft || scrollAreaRight > scrollPortRight;
59
+ if (shouldScrollBlock && block === 'start') y += scrollAreaTop - scrollPortTop;
60
+ else if (shouldScrollBlock && block === 'center') y += (scrollAreaTop + scrollAreaBottom) / 2 - (scrollPortTop + scrollPortBottom) / 2;
61
+ else if (shouldScrollBlock && block === 'end') y += scrollAreaBottom - scrollPortBottom;
62
+ else if (shouldScrollBlock && block === 'nearest') {
63
+ let start = scrollAreaTop - scrollPortTop;
64
+ let end = scrollAreaBottom - scrollPortBottom;
65
+ y += Math.abs(start) <= Math.abs(end) ? start : end;
60
66
  }
61
- return sum;
67
+ if (shouldScrollInline && inline === 'start') x += scrollAreaLeft - scrollPortLeft;
68
+ else if (shouldScrollInline && inline === 'center') x += (scrollAreaLeft + scrollAreaRight) / 2 - (scrollPortLeft + scrollPortRight) / 2;
69
+ else if (shouldScrollInline && inline === 'end') x += scrollAreaRight - scrollPortRight;
70
+ else if (shouldScrollInline && inline === 'nearest') {
71
+ let start = scrollAreaLeft - scrollPortLeft;
72
+ let end = scrollAreaRight - scrollPortRight;
73
+ x += Math.abs(start) <= Math.abs(end) ? start : end;
74
+ }
75
+ if (process.env.NODE_ENV === 'test') {
76
+ scrollView.scrollLeft = x;
77
+ scrollView.scrollTop = y;
78
+ return;
79
+ }
80
+ scrollView.scrollTo({
81
+ left: x,
82
+ top: y
83
+ });
62
84
  }
63
- function $2f04cbc44ee30ce0$export$c826860796309d1b(targetElement, opts) {
64
- if (targetElement && (0, $d4ee10de306f2510$export$4282f70798064fe0)(document, targetElement)) {
85
+ function $2f04cbc44ee30ce0$export$c826860796309d1b(targetElement, opts = {}) {
86
+ let { containingElement: containingElement } = opts;
87
+ if (targetElement && targetElement.isConnected) {
65
88
  let root = document.scrollingElement || document.documentElement;
66
89
  let isScrollPrevented = window.getComputedStyle(root).overflow === 'hidden';
67
- // If scrolling is not currently prevented then we arent in a overlay nor is a overlay open, just use element.scrollIntoView to bring the element into view
68
- if (!isScrollPrevented) {
90
+ // If scrolling is not currently prevented then we aren't in a overlay nor is a overlay open, just use element.scrollIntoView to bring the element into view
91
+ // Also ignore in chrome because of this bug: https://issues.chromium.org/issues/40074749
92
+ if (!isScrollPrevented && !(0, $c87311424ea30a05$export$6446a186d09e379e)()) {
69
93
  var // use scrollIntoView({block: 'nearest'}) instead of .focus to check if the element is fully in view or not since .focus()
70
94
  // won't cause a scroll if the element is already focused and doesn't behave consistently when an element is partially out of view horizontally vs vertically
71
95
  _targetElement_scrollIntoView;
@@ -76,8 +100,8 @@ function $2f04cbc44ee30ce0$export$c826860796309d1b(targetElement, opts) {
76
100
  let { left: newLeft, top: newTop } = targetElement.getBoundingClientRect();
77
101
  // Account for sub pixel differences from rounding
78
102
  if (Math.abs(originalLeft - newLeft) > 1 || Math.abs(originalTop - newTop) > 1) {
79
- var _opts_containingElement_scrollIntoView, _opts_containingElement, _targetElement_scrollIntoView1;
80
- opts === null || opts === void 0 ? void 0 : (_opts_containingElement = opts.containingElement) === null || _opts_containingElement === void 0 ? void 0 : (_opts_containingElement_scrollIntoView = _opts_containingElement.scrollIntoView) === null || _opts_containingElement_scrollIntoView === void 0 ? void 0 : _opts_containingElement_scrollIntoView.call(_opts_containingElement, {
103
+ var _containingElement_scrollIntoView, _targetElement_scrollIntoView1;
104
+ containingElement === null || containingElement === void 0 ? void 0 : (_containingElement_scrollIntoView = containingElement.scrollIntoView) === null || _containingElement_scrollIntoView === void 0 ? void 0 : _containingElement_scrollIntoView.call(containingElement, {
81
105
  block: 'center',
82
106
  inline: 'center'
83
107
  });
@@ -86,10 +110,19 @@ function $2f04cbc44ee30ce0$export$c826860796309d1b(targetElement, opts) {
86
110
  });
87
111
  }
88
112
  } else {
89
- let scrollParents = (0, $a40c673dc9f6d9c7$export$94ed1c92c7beeb22)(targetElement);
113
+ let { left: originalLeft, top: originalTop } = targetElement.getBoundingClientRect();
90
114
  // If scrolling is prevented, we don't want to scroll the body since it might move the overlay partially offscreen and the user can't scroll it back into view.
91
- if (!isScrollPrevented) scrollParents.push(root);
115
+ let scrollParents = (0, $a40c673dc9f6d9c7$export$94ed1c92c7beeb22)(targetElement, true);
92
116
  for (let scrollParent of scrollParents)$2f04cbc44ee30ce0$export$53a0910f038337bd(scrollParent, targetElement);
117
+ let { left: newLeft, top: newTop } = targetElement.getBoundingClientRect();
118
+ // Account for sub pixel differences from rounding
119
+ if (Math.abs(originalLeft - newLeft) > 1 || Math.abs(originalTop - newTop) > 1) {
120
+ scrollParents = containingElement ? (0, $a40c673dc9f6d9c7$export$94ed1c92c7beeb22)(containingElement, true) : [];
121
+ for (let scrollParent of scrollParents)$2f04cbc44ee30ce0$export$53a0910f038337bd(scrollParent, containingElement, {
122
+ block: 'center',
123
+ inline: 'center'
124
+ });
125
+ }
93
126
  }
94
127
  }
95
128
  }