From e95f3972beb643e842f406eda24c6c947d7edd5e Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 13 Jun 2023 12:12:59 +0800 Subject: [PATCH 1/3] Fix padding on library list --- .../web/components/patterns/LibraryCards/LibraryListCard.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx b/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx index 2ee000a48..02a8cedce 100644 --- a/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx +++ b/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx @@ -23,7 +23,8 @@ export function LibraryListCard(props: LinkedItemCardProps): JSX.Element { return ( Date: Tue, 13 Jun 2023 12:37:01 +0800 Subject: [PATCH 2/3] Increase toast interval, add missing package --- .../templates/KeyboardShortcutListModal.tsx | 6 ++++ packages/web/lib/toastHelpers.tsx | 35 ++++++++++++------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/packages/web/components/templates/KeyboardShortcutListModal.tsx b/packages/web/components/templates/KeyboardShortcutListModal.tsx index 7efb60b7f..1b0c1d685 100644 --- a/packages/web/components/templates/KeyboardShortcutListModal.tsx +++ b/packages/web/components/templates/KeyboardShortcutListModal.tsx @@ -76,6 +76,12 @@ const readerCommands = () => { shortcutKeyDescription: 'f', callback: () => {}, }, + { + shortcutKeys: ['escape'], + actionDescription: 'End multi select', + shortcutKeyDescription: 'Escape', + callback: () => {}, + }, { actionDescription: 'Return to library', shortcutKeys: ['u'], diff --git a/packages/web/lib/toastHelpers.tsx b/packages/web/lib/toastHelpers.tsx index 055d402fd..98503bccf 100644 --- a/packages/web/lib/toastHelpers.tsx +++ b/packages/web/lib/toastHelpers.tsx @@ -28,7 +28,7 @@ const FullWidthContainer = styled(HStack, { width: '100%', }) -type ToastType = 'success' | 'error' +type ToastType = 'success' | 'error' const showToast = ( message: string, @@ -38,22 +38,33 @@ const showToast = ( ) => { return toast( ({ id }) => ( - - {type === 'success' ? : } + + {type === 'success' ? ( + + ) : ( + + )} {message} - - toast.dismiss(id)} /> + + toast.dismiss(id)} + /> ), { - style: { - ...toastStyles, - background: background, - }, - duration: 2000, - ...options, - }) + style: { + ...toastStyles, + background: background, + }, + duration: 1500, + ...options, + } + ) } export const showSuccessToast = (message: string, options?: ToastOptions) => { From 70dcbdf974ec4655da3fde93225e41898b10493c Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 13 Jun 2023 13:24:42 +0800 Subject: [PATCH 3/3] Update packages --- yarn.lock | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0a239f537..d27d77048 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8470,6 +8470,11 @@ resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9" integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA== +"@types/loadjs@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/loadjs/-/loadjs-4.0.1.tgz#85e77dcad99d58236462393145eccbbc9dad0fe5" + integrity sha512-UEMOleWwITwDvj+kI6T4etC9yMjmejH6UdJRAa1MWZwzDIW+Iz7T6z6Zc96N/5FeFsxAEBA/zP1ki+HluXPcHQ== + "@types/localforage@0.0.34": version "0.0.34" resolved "https://registry.yarnpkg.com/@types/localforage/-/localforage-0.0.34.tgz#5e31c32dd8791ec4b9ff3ef47c9cb55b2d0d9438" @@ -18981,10 +18986,10 @@ loader-utils@^1.2.3: emojis-list "^3.0.0" json5 "^1.0.1" -loadjs@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/loadjs/-/loadjs-4.2.0.tgz#2a0336376397a6a43edf98c9ec3229ddd5abb6f6" - integrity sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA== +loadjs@^4.3.0-rc1: + version "4.3.0-rc1" + resolved "https://registry.yarnpkg.com/loadjs/-/loadjs-4.3.0-rc1.tgz#c0c5f89bcbf52d5dc9e6f6d6d3b6499c61f47894" + integrity sha512-GvSFQ3YXbeUJAPYzYBjIYIWk6vKID4XYspMfZ0Nq4eJu0TFiD+SlhSUiQ0/gT7t3G/amHVPVrEVcbpda0lF2PA== localforage@*, localforage@^1.10.0, localforage@^1.8.1: version "1.10.0" @@ -23912,13 +23917,6 @@ react-topbar-progress-indicator@^4.1.1: dependencies: topbar "^0.1.3" -react-twitter-widgets@^1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/react-twitter-widgets/-/react-twitter-widgets-1.10.0.tgz#f5395c25b954631b5a2532cdb48005f7db61d370" - integrity sha512-K7MAREhkKJxrhoiNWricKs1O++NyElnVpcplLzZ67gDrmeIsD3E4TUzlt0/nTZAHPOPPc86V4kEd4KIg4de7cQ== - dependencies: - loadjs "^4.2.0" - react-virtual@^2.8.2: version "2.10.4" resolved "https://registry.yarnpkg.com/react-virtual/-/react-virtual-2.10.4.tgz#08712f0acd79d7d6f7c4726f05651a13b24d8704"