Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Add missing packages
This commit is contained in:
Jackson Harper
2023-06-16 14:04:00 +08:00
committed by GitHub
parent fab9064696 70dcbdf974
commit 9904ccda64
3 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/web/components/templates/KeyboardShortcutListModal.tsx
View File

@ -76,6 +76,12 @@ const readerCommands = () => {
shortcutKeyDescription: 'f', shortcutKeyDescription: 'f',
callback: () => {}, callback: () => {},
}, },
{
shortcutKeys: ['escape'],
actionDescription: 'End multi select',
shortcutKeyDescription: 'Escape',
callback: () => {},
},
{ {
actionDescription: 'Return to library', actionDescription: 'Return to library',
shortcutKeys: ['u'], shortcutKeys: ['u'],

35
packages/web/lib/toastHelpers.tsx
View File

@ -28,7 +28,7 @@ const FullWidthContainer = styled(HStack, {
width: '100%', width: '100%',
}) })
type ToastType = 'success' | 'error' type ToastType = 'success' | 'error'
const showToast = ( const showToast = (
message: string, message: string,
@ -38,22 +38,33 @@ const showToast = (
) => { ) => {
return toast( return toast(
({ id }) => ( ({ id }) => (
<FullWidthContainer alignment='center'> <FullWidthContainer alignment="center">
{type === 'success' ? <CheckCircle size={24} color='white' /> : <WarningCircle size={24} color='white' />} {type === 'success' ? (
<CheckCircle size={24} color="white" />
) : (
<WarningCircle size={24} color="white" />
)}
<MessageContainer>{message}</MessageContainer> <MessageContainer>{message}</MessageContainer>
<HStack distribution='end' css={{marginLeft: 16}}> <HStack distribution="end" css={{ marginLeft: 16 }}>
<X size={18} style={{cursor: 'pointer'}} color='#CCEAC4' weight='bold' onClick={() => toast.dismiss(id)} /> <X
size={18}
style={{ cursor: 'pointer' }}
color="#CCEAC4"
weight="bold"
onClick={() => toast.dismiss(id)}
/>
</HStack> </HStack>
</FullWidthContainer> </FullWidthContainer>
), ),
{ {
style: { style: {
...toastStyles, ...toastStyles,
background: background, background: background,
}, },
duration: 2000, duration: 1500,
...options, ...options,
}) }
)
} }
export const showSuccessToast = (message: string, options?: ToastOptions) => { export const showSuccessToast = (message: string, options?: ToastOptions) => {

20
yarn.lock
View File

@ -8477,6 +8477,11 @@
resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9" resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA== 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": "@types/localforage@0.0.34":
version "0.0.34" version "0.0.34"
resolved "https://registry.yarnpkg.com/@types/localforage/-/localforage-0.0.34.tgz#5e31c32dd8791ec4b9ff3ef47c9cb55b2d0d9438" 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" emojis-list "^3.0.0"
json5 "^1.0.1" json5 "^1.0.1"
loadjs@^4.2.0: loadjs@^4.3.0-rc1:
version "4.2.0" version "4.3.0-rc1"
resolved "https://registry.yarnpkg.com/loadjs/-/loadjs-4.2.0.tgz#2a0336376397a6a43edf98c9ec3229ddd5abb6f6" resolved "https://registry.yarnpkg.com/loadjs/-/loadjs-4.3.0-rc1.tgz#c0c5f89bcbf52d5dc9e6f6d6d3b6499c61f47894"
integrity sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA== integrity sha512-GvSFQ3YXbeUJAPYzYBjIYIWk6vKID4XYspMfZ0Nq4eJu0TFiD+SlhSUiQ0/gT7t3G/amHVPVrEVcbpda0lF2PA==
localforage@*, localforage@^1.10.0, localforage@^1.8.1: localforage@*, localforage@^1.10.0, localforage@^1.8.1:
version "1.10.0" version "1.10.0"
@ -23917,13 +23922,6 @@ react-topbar-progress-indicator@^4.1.1:
dependencies: dependencies:
topbar "^0.1.3" 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: react-virtual@^2.8.2:
version "2.10.4" version "2.10.4"
resolved "https://registry.yarnpkg.com/react-virtual/-/react-virtual-2.10.4.tgz#08712f0acd79d7d6f7c4726f05651a13b24d8704" resolved "https://registry.yarnpkg.com/react-virtual/-/react-virtual-2.10.4.tgz#08712f0acd79d7d6f7c4726f05651a13b24d8704"