@artsy/palette 29.7.0 → 29.7.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.
|
@@ -11,8 +11,6 @@ var _useCursor2 = require("use-cursor");
|
|
|
11
11
|
|
|
12
12
|
var _useMutationObserver = require("./useMutationObserver");
|
|
13
13
|
|
|
14
|
-
var _tabbable = require("tabbable");
|
|
15
|
-
|
|
16
14
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
17
15
|
|
|
18
16
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
@@ -25,6 +23,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
|
|
|
25
23
|
|
|
26
24
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
27
25
|
|
|
26
|
+
var FOCUSABLE_SELECTOR = ["a[href]:not([tabindex='-1'])", "area[href]:not([tabindex='-1'])", "input:not([disabled]):not([tabindex='-1'])", "select:not([disabled]):not([tabindex='-1'])", "textarea:not([disabled]):not([tabindex='-1'])", "button:not([disabled]):not([tabindex='-1'])", '[tabindex="0"]'].join(", ");
|
|
27
|
+
|
|
28
28
|
/**
|
|
29
29
|
* Locks focus within the given element
|
|
30
30
|
*/
|
|
@@ -40,20 +40,12 @@ var useFocusLock = function useFocusLock(_ref) {
|
|
|
40
40
|
|
|
41
41
|
var updateFocusableEls = (0, _react.useCallback)(function () {
|
|
42
42
|
if (ref.current === null) return;
|
|
43
|
-
setFocusableEls(
|
|
43
|
+
setFocusableEls(Array.from(ref.current.querySelectorAll(FOCUSABLE_SELECTOR))); // When `active` changes that typically means our target ref
|
|
44
44
|
// is being inserted into the DOM, so we need to update the focusable elements.
|
|
45
45
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
46
46
|
}, [active]); // Set initial focusable elements on mount
|
|
47
47
|
|
|
48
|
-
(0, _react.useEffect)(
|
|
49
|
-
// Wait for the next tick to ensure focusable elements are in the DOM
|
|
50
|
-
var timeout = setTimeout(function () {
|
|
51
|
-
updateFocusableEls();
|
|
52
|
-
}, 0);
|
|
53
|
-
return function () {
|
|
54
|
-
clearTimeout(timeout);
|
|
55
|
-
};
|
|
56
|
-
}, [updateFocusableEls]);
|
|
48
|
+
(0, _react.useEffect)(updateFocusableEls, [updateFocusableEls]);
|
|
57
49
|
var skipUpdateFocusRef = (0, _react.useRef)(false); // Detects when DOM changes and updates focusable elements
|
|
58
50
|
|
|
59
51
|
(0, _useMutationObserver.useMutationObserver)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/useFocusLock.ts"],"names":["useFocusLock","ref","active","focusableEls","setFocusableEls","updateFocusableEls","current","
|
|
1
|
+
{"version":3,"sources":["../../src/utils/useFocusLock.ts"],"names":["FOCUSABLE_SELECTOR","join","useFocusLock","ref","active","focusableEls","setFocusableEls","updateFocusableEls","current","Array","from","querySelectorAll","skipUpdateFocusRef","onMutate","mutations","hasMeaningfullyMutated","some","mutation","addedNodes","length","removedNodes","max","focusableIndex","index","handlePrev","handleNext","setCursor","focus","handleKeydown","event","key","preventDefault","stopPropagation","shiftKey","focusedElPriorToOpen","document","activeElement","addEventListener","removeEventListener","handleClick","target","findIndex","node","handleFocusIn","focusableEl","stopImmediatePropagation"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;;;;;;;;;;;;;AAEA,IAAMA,kBAAkB,GAAG,CACzB,8BADyB,EAEzB,iCAFyB,EAGzB,4CAHyB,EAIzB,6CAJyB,EAKzB,+CALyB,EAMzB,6CANyB,EAOzB,gBAPyB,EAQzBC,IARyB,CAQpB,IARoB,CAA3B;;AAeA;AACA;AACA;AACO,IAAMC,YAAY,GAAG,SAAfA,YAAe,OAA0C;AAAA,MAAvCC,GAAuC,QAAvCA,GAAuC;AAAA,yBAAlCC,MAAkC;AAAA,MAAlCA,MAAkC,4BAAzB,IAAyB;;AACpE,kBAAwC,qBAAwB,EAAxB,CAAxC;AAAA;AAAA,MAAOC,YAAP;AAAA,MAAqBC,eAArB;;AAEA,MAAMC,kBAAkB,GAAG,wBAAY,YAAM;AAC3C,QAAIJ,GAAG,CAACK,OAAJ,KAAgB,IAApB,EAA0B;AAE1BF,IAAAA,eAAe,CACbG,KAAK,CAACC,IAAN,CAAWP,GAAG,CAACK,OAAJ,CAAYG,gBAAZ,CAA0CX,kBAA1C,CAAX,CADa,CAAf,CAH2C,CAO3C;AACA;AACA;AACD,GAV0B,EAUxB,CAACI,MAAD,CAVwB,CAA3B,CAHoE,CAepE;;AACA,wBAAUG,kBAAV,EAA8B,CAACA,kBAAD,CAA9B;AAEA,MAAMK,kBAAkB,GAAG,mBAAO,KAAP,CAA3B,CAlBoE,CAoBpE;;AACA,gDAAoB;AAClBT,IAAAA,GAAG,EAAHA,GADkB;AAElBU,IAAAA,QAAQ,EAAE,kBAACC,SAAD,EAAe;AACvB;AACA,UAAMC,sBAAsB,GAAGD,SAAS,CAACE,IAAV,CAAe,UAACC,QAAD,EAAc;AAC1D,eACEA,QAAQ,CAACC,UAAT,CAAoBC,MAApB,GAA6B,CAA7B,IAAkCF,QAAQ,CAACG,YAAT,CAAsBD,MAAtB,GAA+B,CADnE;AAGD,OAJ8B,CAA/B;;AAMA,UAAIJ,sBAAJ,EAA4B;AAC1BH,QAAAA,kBAAkB,CAACJ,OAAnB,GAA6B,IAA7B;AACAD,QAAAA,kBAAkB;AACnB;AACF;AAdiB,GAApB;;AAiBA,mBAKI,2BAAU;AAAEc,IAAAA,GAAG,EAAEhB,YAAY,CAACc;AAApB,GAAV,CALJ;AAAA,MACSG,cADT,cACEC,KADF;AAAA,MAEEC,UAFF,cAEEA,UAFF;AAAA,MAGEC,UAHF,cAGEA,UAHF;AAAA,MAIEC,SAJF,cAIEA,SAJF,CAtCoE,CA6CpE;;;AACA,wBAAU,YAAM;AACd,QAAI,CAACrB,YAAY,CAACc,MAAlB,EAA0B,OADZ,CAGd;AACA;;AACA,QAAIP,kBAAkB,CAACJ,OAAvB,EAAgC;AAC9BI,MAAAA,kBAAkB,CAACJ,OAAnB,GAA6B,KAA7B;AACA;AACD;;AAEDH,IAAAA,YAAY,CAACiB,cAAD,CAAZ,CAA6BK,KAA7B;AACD,GAXD,EAWG,CAACtB,YAAD,EAAeiB,cAAf,CAXH,EA9CoE,CA2DpE;;AACA,wBAAU,YAAM;AACd,QAAMM,aAAa,GAAG,SAAhBA,aAAgB,CAACC,KAAD,EAA0B;AAC9C,UAAI,CAACzB,MAAL,EAAa;;AAEb,cAAQyB,KAAK,CAACC,GAAd;AACE,aAAK,KAAL;AACE;AACAD,UAAAA,KAAK,CAACE,cAAN;AACAF,UAAAA,KAAK,CAACG,eAAN,GAHF,CAKE;;AACAH,UAAAA,KAAK,CAACI,QAAN,GAAiBT,UAAU,EAA3B,GAAgCC,UAAU,EAA1C;AACA;;AACF;AACE;AAVJ;AAYD,KAfD;;AAiBA,QAAMS,oBAAoB,GAAGC,QAAQ,CAACC,aAAtC;AAEAD,IAAAA,QAAQ,CAACE,gBAAT,CAA0B,SAA1B,EAAqCT,aAArC;AAEA,WAAO,YAAM;AACX;AACAM,MAAAA,oBAAoB,CAACP,KAArB;AAEAQ,MAAAA,QAAQ,CAACG,mBAAT,CAA6B,SAA7B,EAAwCV,aAAxC;AACD,KALD;AAMD,GA5BD,EA4BG,CAACxB,MAAD,EAASqB,UAAT,EAAqBD,UAArB,CA5BH;AA8BA,wBAAU,YAAM;AACd;AACA,QAAMe,WAAW,GAAG,SAAdA,WAAc,CAACV,KAAD,EAAuB;AACzC,UAAIA,KAAK,CAACW,MAAN,KAAiBL,QAAQ,CAACC,aAA9B,EAA6C;AAE7C,UAAMb,KAAK,GAAGlB,YAAY,CAACoC,SAAb,CAAuB,UAACC,IAAD;AAAA,eAAUA,IAAI,KAAKb,KAAK,CAACW,MAAzB;AAAA,OAAvB,CAAd;AAEA,UAAIjB,KAAK,KAAK,CAAC,CAAf,EAAkB;AAElBG,MAAAA,SAAS,CAACH,KAAD,CAAT;AACD,KARD,CAFc,CAYd;;;AACA,QAAMoB,aAAa,GAAG,SAAhBA,aAAgB,CAACd,KAAD,EAAuB;AAC3C,UAAMN,KAAK,GAAGlB,YAAY,CAACoC,SAAb,CAAuB,UAACC,IAAD;AAAA,eAAUA,IAAI,KAAKb,KAAK,CAACW,MAAzB;AAAA,OAAvB,CAAd;AACA,UAAMI,WAAW,GAAGvC,YAAY,CAACiB,cAAD,CAAhC;;AAEA,UAAIC,KAAK,KAAK,CAAC,CAAX,IAAgB,CAAC,CAACqB,WAAtB,EAAmC;AACjCf,QAAAA,KAAK,CAACgB,wBAAN;AACAD,QAAAA,WAAW,CAACjB,KAAZ;AACA;AACD;AACF,KATD;;AAWAQ,IAAAA,QAAQ,CAACE,gBAAT,CAA0B,OAA1B,EAAmCE,WAAnC;AACAJ,IAAAA,QAAQ,CAACE,gBAAT,CAA0B,SAA1B,EAAqCM,aAArC;AACA,WAAO,YAAM;AACXR,MAAAA,QAAQ,CAACG,mBAAT,CAA6B,OAA7B,EAAsCC,WAAtC;AACAJ,MAAAA,QAAQ,CAACG,mBAAT,CAA6B,SAA7B,EAAwCK,aAAxC;AACD,KAHD;AAID,GA9BD,EA8BG,CAACtC,YAAD,EAAeiB,cAAf,EAA+BI,SAA/B,CA9BH;AA+BD,CAzHM","sourcesContent":["import React, { useCallback, useEffect, useRef, useState } from \"react\"\nimport { useCursor } from \"use-cursor\"\nimport { useMutationObserver } from \"./useMutationObserver\"\n\nconst FOCUSABLE_SELECTOR = [\n \"a[href]:not([tabindex='-1'])\",\n \"area[href]:not([tabindex='-1'])\",\n \"input:not([disabled]):not([tabindex='-1'])\",\n \"select:not([disabled]):not([tabindex='-1'])\",\n \"textarea:not([disabled]):not([tabindex='-1'])\",\n \"button:not([disabled]):not([tabindex='-1'])\",\n '[tabindex=\"0\"]',\n].join(\", \")\n\ninterface UseFocusLock {\n ref: React.MutableRefObject<HTMLElement | null>\n active?: boolean\n}\n\n/**\n * Locks focus within the given element\n */\nexport const useFocusLock = ({ ref, active = true }: UseFocusLock) => {\n const [focusableEls, setFocusableEls] = useState<HTMLElement[]>([])\n\n const updateFocusableEls = useCallback(() => {\n if (ref.current === null) return\n\n setFocusableEls(\n Array.from(ref.current.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR))\n )\n\n // When `active` changes that typically means our target ref\n // is being inserted into the DOM, so we need to update the focusable elements.\n // eslint-disable-next-line react-hooks/exhaustive-deps\n }, [active])\n\n // Set initial focusable elements on mount\n useEffect(updateFocusableEls, [updateFocusableEls])\n\n const skipUpdateFocusRef = useRef(false)\n\n // Detects when DOM changes and updates focusable elements\n useMutationObserver({\n ref,\n onMutate: (mutations) => {\n // Check to see if any of the mutations has either added or removed nodes\n const hasMeaningfullyMutated = mutations.some((mutation) => {\n return (\n mutation.addedNodes.length > 0 || mutation.removedNodes.length > 0\n )\n })\n\n if (hasMeaningfullyMutated) {\n skipUpdateFocusRef.current = true\n updateFocusableEls()\n }\n },\n })\n\n const {\n index: focusableIndex,\n handlePrev,\n handleNext,\n setCursor,\n } = useCursor({ max: focusableEls.length })\n\n // Moves focus when index changes\n useEffect(() => {\n if (!focusableEls.length) return\n\n // In order to avoid a loop when a focus might be the cause of a mutation,\n // we skip focusing the el.\n if (skipUpdateFocusRef.current) {\n skipUpdateFocusRef.current = false\n return\n }\n\n focusableEls[focusableIndex].focus()\n }, [focusableEls, focusableIndex])\n\n // Handle keyboard navigation\n useEffect(() => {\n const handleKeydown = (event: KeyboardEvent) => {\n if (!active) return\n\n switch (event.key) {\n case \"Tab\":\n // Lock focus within element\n event.preventDefault()\n event.stopPropagation()\n\n // Move focus up or down\n event.shiftKey ? handlePrev() : handleNext()\n break\n default:\n break\n }\n }\n\n const focusedElPriorToOpen = document.activeElement as HTMLElement\n\n document.addEventListener(\"keydown\", handleKeydown)\n\n return () => {\n // Return the focus\n focusedElPriorToOpen.focus()\n\n document.removeEventListener(\"keydown\", handleKeydown)\n }\n }, [active, handleNext, handlePrev])\n\n useEffect(() => {\n // Update the index when any focusable is clicked\n const handleClick = (event: MouseEvent) => {\n if (event.target !== document.activeElement) return\n\n const index = focusableEls.findIndex((node) => node === event.target)\n\n if (index === -1) return\n\n setCursor(index)\n }\n\n // If focus escapes the trap, pull it back in\n const handleFocusIn = (event: FocusEvent) => {\n const index = focusableEls.findIndex((node) => node === event.target)\n const focusableEl = focusableEls[focusableIndex]\n\n if (index === -1 && !!focusableEl) {\n event.stopImmediatePropagation()\n focusableEl.focus()\n return\n }\n }\n\n document.addEventListener(\"click\", handleClick)\n document.addEventListener(\"focusin\", handleFocusIn)\n return () => {\n document.removeEventListener(\"click\", handleClick)\n document.removeEventListener(\"focusin\", handleFocusIn)\n }\n }, [focusableEls, focusableIndex, setCursor])\n}\n"],"file":"useFocusLock.js"}
|
|
@@ -48,9 +48,6 @@ var Default = function Default() {
|
|
|
48
48
|
variant: "primaryGray",
|
|
49
49
|
tabIndex: -1
|
|
50
50
|
}, "Skipped"), /*#__PURE__*/_react.default.createElement(_Button.Button, {
|
|
51
|
-
variant: "primaryGray",
|
|
52
|
-
disabled: true
|
|
53
|
-
}, "Disabled"), /*#__PURE__*/_react.default.createElement(_Button.Button, {
|
|
54
51
|
variant: "primaryGray"
|
|
55
52
|
}, "Focusable")), /*#__PURE__*/_react.default.createElement(_Input.Input, {
|
|
56
53
|
placeholder: "Not focusable"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/useFocusLock.story.tsx"],"names":["title","Default","ref","WithAutocompleteInput","text","value"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;;;;;eAEe;AACbA,EAAAA,KAAK,EAAE;AADM,C;;;AAIR,IAAMC,OAAO,GAAG,SAAVA,OAAU,GAAM;AAC3B,MAAMC,GAAG,GAAG,mBAA8B,IAA9B,CAAZ;AAEA,kCAAa;AAAEA,IAAAA,GAAG,EAAHA;AAAF,GAAb;AAEA,sBACE,yEACE,6BAAC,YAAD;AAAO,IAAA,WAAW,EAAC;AAAnB,IADF,eAEE;AAAK,IAAA,GAAG,EAAEA;AAAV,kBACE,6BAAC,YAAD;AAAO,IAAA,WAAW,EAAC;AAAnB,IADF,eAEE,6BAAC,YAAD;AAAO,IAAA,WAAW,EAAC;AAAnB,IAFF,eAGE;AAAG,IAAA,IAAI,EAAC,GAAR;AAAY,IAAA,QAAQ,EAAE,CAAC;AAAvB,eAHF,eAME;AAAG,IAAA,IAAI,EAAC;AAAR,iBANF,eAOE,6BAAC,cAAD;AAAQ,IAAA,OAAO,EAAC,aAAhB;AAA8B,IAAA,QAAQ,EAAE,CAAC;AAAzC,eAPF,eAUE,6BAAC,cAAD;AAAQ,IAAA,OAAO,EAAC
|
|
1
|
+
{"version":3,"sources":["../../src/utils/useFocusLock.story.tsx"],"names":["title","Default","ref","WithAutocompleteInput","text","value"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;;;;;eAEe;AACbA,EAAAA,KAAK,EAAE;AADM,C;;;AAIR,IAAMC,OAAO,GAAG,SAAVA,OAAU,GAAM;AAC3B,MAAMC,GAAG,GAAG,mBAA8B,IAA9B,CAAZ;AAEA,kCAAa;AAAEA,IAAAA,GAAG,EAAHA;AAAF,GAAb;AAEA,sBACE,yEACE,6BAAC,YAAD;AAAO,IAAA,WAAW,EAAC;AAAnB,IADF,eAEE;AAAK,IAAA,GAAG,EAAEA;AAAV,kBACE,6BAAC,YAAD;AAAO,IAAA,WAAW,EAAC;AAAnB,IADF,eAEE,6BAAC,YAAD;AAAO,IAAA,WAAW,EAAC;AAAnB,IAFF,eAGE;AAAG,IAAA,IAAI,EAAC,GAAR;AAAY,IAAA,QAAQ,EAAE,CAAC;AAAvB,eAHF,eAME;AAAG,IAAA,IAAI,EAAC;AAAR,iBANF,eAOE,6BAAC,cAAD;AAAQ,IAAA,OAAO,EAAC,aAAhB;AAA8B,IAAA,QAAQ,EAAE,CAAC;AAAzC,eAPF,eAUE,6BAAC,cAAD;AAAQ,IAAA,OAAO,EAAC;AAAhB,iBAVF,CAFF,eAcE,6BAAC,YAAD;AAAO,IAAA,WAAW,EAAC;AAAnB,IAdF,CADF;AAkBD,CAvBM;;;;AAyBA,IAAMC,qBAAqB,GAAG,SAAxBA,qBAAwB,GAAM;AACzC,MAAMD,GAAG,GAAG,mBAA8B,IAA9B,CAAZ;AAEA,kCAAa;AAAEA,IAAAA,GAAG,EAAHA;AAAF,GAAb;AAEA,sBACE;AAAK,IAAA,GAAG,EAAEA;AAAV,kBACE,6BAAC,YAAD;AAAO,IAAA,WAAW,EAAC;AAAnB,IADF,eAEE,6BAAC,YAAD;AAAO,IAAA,WAAW,EAAC;AAAnB,IAFF,eAGE,6BAAC,oCAAD;AACE,IAAA,WAAW,EAAC,WADd;AAEE,IAAA,OAAO,EAAE,CACP;AAAEE,MAAAA,IAAI,EAAE,KAAR;AAAeC,MAAAA,KAAK,EAAE;AAAtB,KADO,EAEP;AAAED,MAAAA,IAAI,EAAE,KAAR;AAAeC,MAAAA,KAAK,EAAE;AAAtB,KAFO,EAGP;AAAED,MAAAA,IAAI,EAAE,OAAR;AAAiBC,MAAAA,KAAK,EAAE;AAAxB,KAHO;AAFX,IAHF,CADF;AAcD,CAnBM;;;AAAMF,qB","sourcesContent":["import React, { useRef } from \"react\"\nimport { useFocusLock } from \"./useFocusLock\"\nimport { Input } from \"../elements/Input\"\nimport { Button } from \"../elements/Button\"\nimport { AutocompleteInput } from \"../elements/AutocompleteInput\"\n\nexport default {\n title: \"Hooks/useFocusLock\",\n}\n\nexport const Default = () => {\n const ref = useRef<HTMLDivElement | null>(null)\n\n useFocusLock({ ref })\n\n return (\n <>\n <Input placeholder=\"Not focusable\" />\n <div ref={ref}>\n <Input placeholder=\"Focusable\" />\n <Input placeholder=\"Focusable\" />\n <a href=\"#\" tabIndex={-1}>\n Skipped\n </a>\n <a href=\"#\">Focusable</a>\n <Button variant=\"primaryGray\" tabIndex={-1}>\n Skipped\n </Button>\n <Button variant=\"primaryGray\">Focusable</Button>\n </div>\n <Input placeholder=\"Not focusable\" />\n </>\n )\n}\n\nexport const WithAutocompleteInput = () => {\n const ref = useRef<HTMLDivElement | null>(null)\n\n useFocusLock({ ref })\n\n return (\n <div ref={ref}>\n <Input placeholder=\"Focusable\" />\n <Input placeholder=\"Focusable\" />\n <AutocompleteInput\n placeholder=\"Focusable\"\n options={[\n { text: \"One\", value: \"one\" },\n { text: \"Two\", value: \"two\" },\n { text: \"Three\", value: \"three\" },\n ]}\n />\n </div>\n )\n}\n"],"file":"useFocusLock.story.js"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@artsy/palette",
|
|
3
|
-
"version": "29.7.
|
|
3
|
+
"version": "29.7.1",
|
|
4
4
|
"description": "Design system library for react components",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -122,7 +122,6 @@
|
|
|
122
122
|
"react-lazy-load-image-component": "1.5.5",
|
|
123
123
|
"react-remove-scroll": "2.5.5",
|
|
124
124
|
"styled-system": "^5.1.5",
|
|
125
|
-
"tabbable": "^6.1.1",
|
|
126
125
|
"trunc-html": "^1.1.2",
|
|
127
126
|
"use-cursor": "^1.2.3",
|
|
128
127
|
"use-keyboard-list-navigation": "2.4.2"
|
|
@@ -175,5 +174,5 @@
|
|
|
175
174
|
"<rootDir>/www/"
|
|
176
175
|
]
|
|
177
176
|
},
|
|
178
|
-
"gitHead": "
|
|
177
|
+
"gitHead": "557da24fc0f9d24907fa42aa737c5d007b95fe91"
|
|
179
178
|
}
|