Merge pull request #2341 from omnivore-app/fix/multi-select-filter

Add missing packages

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'],

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 }) => (
-      <FullWidthContainer alignment='center'>
-        {type === 'success' ? <CheckCircle size={24} color='white' /> : <WarningCircle size={24} color='white' />}
+      <FullWidthContainer alignment="center">
+        {type === 'success' ? (
+          <CheckCircle size={24} color="white" />
+        ) : (
+          <WarningCircle size={24} color="white" />
+        )}
         <MessageContainer>{message}</MessageContainer>
-        <HStack distribution='end' css={{marginLeft: 16}}>
-          <X size={18} style={{cursor: 'pointer'}} color='#CCEAC4' weight='bold' onClick={() => toast.dismiss(id)} />
+        <HStack distribution="end" css={{ marginLeft: 16 }}>
+          <X
+            size={18}
+            style={{ cursor: 'pointer' }}
+            color="#CCEAC4"
+            weight="bold"
+            onClick={() => toast.dismiss(id)}
+          />
         </HStack>
       </FullWidthContainer>
     ),
     {
-    style: {
-      ...toastStyles,
-      background: background,
-    },
-    duration: 2000,
-    ...options,
-  })
+      style: {
+        ...toastStyles,
+        background: background,
+      },
+      duration: 1500,
+      ...options,
+    }
+  )
 }
 
 export const showSuccessToast = (message: string, options?: ToastOptions) => {

yarn.lock

@@ -8477,6 +8477,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"
@@ -18986,10 +18991,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"
@@ -23917,13 +23922,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"