From 09fc2b4c9acf52038d9022388cc91ff2b5f57ebb Mon Sep 17 00:00:00 2001 From: Linh Chau <94718676+linh-transcend@users.noreply.github.com> Date: Fri, 6 Dec 2024 16:08:55 -0500 Subject: [PATCH] Update autofocus to use 'on' and 'off' (#201) * update airgap.js-types * update autofocus type to on/off * bump package version * simplify the conditionals to turn off autorfocus --- .pnp.cjs | 10 +++++----- ...ypes-npm-12.7.0-0148ad0fdc-df8d244c63.zip} | Bin 138528 -> 138685 bytes package.json | 4 ++-- src/components/Main.tsx | 2 +- src/hooks/useViewState.ts | 6 +++--- yarn.lock | 10 +++++----- 6 files changed, 16 insertions(+), 16 deletions(-) rename .yarn/cache/{@transcend-io-airgap.js-types-npm-12.6.0-6d4470c14e-4d22a5b1b7.zip => @transcend-io-airgap.js-types-npm-12.7.0-0148ad0fdc-df8d244c63.zip} (83%) diff --git a/.pnp.cjs b/.pnp.cjs index 2b69e57..bda602a 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -32,7 +32,7 @@ const RAW_RUNTIME_STATE = ["@prettier/sync", "virtual:c76842a5689228a0ce1b65e064c1f5e0d5b61e442d08b6527a3b1f100ca1f2105e58f5f1435c5a59df3cce3338560737838d99dae36d25b47d20aa50c89d0539#npm:0.5.2"],\ ["@testing-library/jest-dom", "npm:6.4.8"],\ ["@testing-library/preact", "virtual:c76842a5689228a0ce1b65e064c1f5e0d5b61e442d08b6527a3b1f100ca1f2105e58f5f1435c5a59df3cce3338560737838d99dae36d25b47d20aa50c89d0539#npm:3.2.4"],\ - ["@transcend-io/airgap.js-types", "npm:12.6.0"],\ + ["@transcend-io/airgap.js-types", "npm:12.7.0"],\ ["@transcend-io/internationalization", "npm:1.6.0"],\ ["@transcend-io/logger", "npm:1.1.0"],\ ["@transcend-io/type-utils", "npm:1.5.0"],\ @@ -1756,10 +1756,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@transcend-io/airgap.js-types", [\ - ["npm:12.6.0", {\ - "packageLocation": "./.yarn/cache/@transcend-io-airgap.js-types-npm-12.6.0-6d4470c14e-4d22a5b1b7.zip/node_modules/@transcend-io/airgap.js-types/",\ + ["npm:12.7.0", {\ + "packageLocation": "./.yarn/cache/@transcend-io-airgap.js-types-npm-12.7.0-0148ad0fdc-df8d244c63.zip/node_modules/@transcend-io/airgap.js-types/",\ "packageDependencies": [\ - ["@transcend-io/airgap.js-types", "npm:12.6.0"],\ + ["@transcend-io/airgap.js-types", "npm:12.7.0"],\ ["@transcend-io/type-utils", "npm:1.4.2"],\ ["fp-ts", "npm:2.16.9"],\ ["io-ts", "virtual:647270e91e7a3b3be8360975cf4b261fc37aa1becc6251358c91b0bf0733ffddc3f7d7b9c35550155c202696cf87b8999803730126a6d8c46e4270742d944b5d#npm:2.2.21"]\ @@ -1788,7 +1788,7 @@ const RAW_RUNTIME_STATE = ["@prettier/sync", "virtual:c76842a5689228a0ce1b65e064c1f5e0d5b61e442d08b6527a3b1f100ca1f2105e58f5f1435c5a59df3cce3338560737838d99dae36d25b47d20aa50c89d0539#npm:0.5.2"],\ ["@testing-library/jest-dom", "npm:6.4.8"],\ ["@testing-library/preact", "virtual:c76842a5689228a0ce1b65e064c1f5e0d5b61e442d08b6527a3b1f100ca1f2105e58f5f1435c5a59df3cce3338560737838d99dae36d25b47d20aa50c89d0539#npm:3.2.4"],\ - ["@transcend-io/airgap.js-types", "npm:12.6.0"],\ + ["@transcend-io/airgap.js-types", "npm:12.7.0"],\ ["@transcend-io/internationalization", "npm:1.6.0"],\ ["@transcend-io/logger", "npm:1.1.0"],\ ["@transcend-io/type-utils", "npm:1.5.0"],\ diff --git a/.yarn/cache/@transcend-io-airgap.js-types-npm-12.6.0-6d4470c14e-4d22a5b1b7.zip b/.yarn/cache/@transcend-io-airgap.js-types-npm-12.7.0-0148ad0fdc-df8d244c63.zip similarity index 83% rename from .yarn/cache/@transcend-io-airgap.js-types-npm-12.6.0-6d4470c14e-4d22a5b1b7.zip rename to .yarn/cache/@transcend-io-airgap.js-types-npm-12.7.0-0148ad0fdc-df8d244c63.zip index f1bc0d869dced389019b4ed6b4f6df2d072c38c4..9bb40f0e00283971d94f7b7e2d5d7388cc001926 100644 GIT binary patch delta 19151 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 T-he~`7ZQQcU^=!SU)}!?Kq~I2 diff --git a/package.json b/package.json index f680502..06cc50b 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "url": "https://github.com/transcend-io/consent-manager-ui.git" }, "homepage": "https://github.com/transcend-io/consent-manager-ui", - "version": "4.23.0", + "version": "4.24.0", "license": "MIT", "main": "build/ui", "files": [ @@ -51,7 +51,7 @@ "@prettier/sync": "^0.5.2", "@testing-library/jest-dom": "^6.4.6", "@testing-library/preact": "^3.2.4", - "@transcend-io/airgap.js-types": "^12.6.0", + "@transcend-io/airgap.js-types": "^12.7.0", "@transcend-io/type-utils": "^1.5.0", "@types/jest": "^29.5.12", "@types/node": "^17.0.45", diff --git a/src/components/Main.tsx b/src/components/Main.tsx index 7c838e6..a3fd7cb 100644 --- a/src/components/Main.tsx +++ b/src/components/Main.tsx @@ -77,7 +77,7 @@ export function Main({ const dialogRef = useRef(null); useEffect(() => { if (!isViewStateClosed(viewState) && dialogRef.current) { - const shouldAutofocus = config.autofocus ?? true; + const shouldAutofocus = config?.autofocus !== 'off'; // This setTimeout was necessary for the api triggered states, (DoNotSell|OptOut)Disclosure setTimeout(() => { if (dialogRef.current && shouldAutofocus) { diff --git a/src/hooks/useViewState.ts b/src/hooks/useViewState.ts index 2605099..12baf83 100644 --- a/src/hooks/useViewState.ts +++ b/src/hooks/useViewState.ts @@ -63,8 +63,8 @@ export function useViewState({ eventTarget: EventTarget; /** Element previously focused before our ui modal was opened */ savedActiveElement: HTMLElement | null; - /** Whether to on last focused element on reopen */ - autofocus?: boolean; + /** Whether to on last focused element on reopen: on or off */ + autofocus?: string; }): { /** The current view state */ viewState: ViewState; @@ -137,7 +137,7 @@ export function useViewState({ * very difficult to interact with. We create an element with maximum focus priority and * focus it so that when we delete it the user will be at the start of the focus order * just like if they had freshly loaded the page. */ - const shouldFocus = autofocus ?? true; + const shouldFocus = autofocus !== 'off'; if (savedActiveElement !== null && shouldFocus) { savedActiveElement.focus(); } else { diff --git a/yarn.lock b/yarn.lock index ed6a693..37d1877 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1123,14 +1123,14 @@ __metadata: languageName: node linkType: hard -"@transcend-io/airgap.js-types@npm:^12.6.0": - version: 12.6.0 - resolution: "@transcend-io/airgap.js-types@npm:12.6.0" +"@transcend-io/airgap.js-types@npm:^12.7.0": + version: 12.7.0 + resolution: "@transcend-io/airgap.js-types@npm:12.7.0" dependencies: "@transcend-io/type-utils": "npm:^1.2.0" fp-ts: "npm:^2.16.1" io-ts: "npm:^2.2.21" - checksum: 10/4d22a5b1b77c3b2d03995f142171d69664df31d6212bd2776762a5aa90cb6f2b0bfe44b8d00f3647be1558dab8080348d7cd6800aeee2d510de6b7aa2699a88a + checksum: 10/df8d244c633f0f205c0e2382aaea5da0d5d64fc45d6473bf33a7cccbfc880c0703324b7f37469692f7a4ad3b43d14187cfa9a814c51275d9729e527b815242d6 languageName: node linkType: hard @@ -1155,7 +1155,7 @@ __metadata: "@prettier/sync": "npm:^0.5.2" "@testing-library/jest-dom": "npm:^6.4.6" "@testing-library/preact": "npm:^3.2.4" - "@transcend-io/airgap.js-types": "npm:^12.6.0" + "@transcend-io/airgap.js-types": "npm:^12.7.0" "@transcend-io/internationalization": "npm:^1.6.0" "@transcend-io/logger": "npm:^1.1.0" "@transcend-io/type-utils": "npm:^1.5.0"