refactor: hide keyboard shortcuts if on mobile

This commit is contained in:
Mo
2022-11-28 10:00:35 -06:00
parent 81774d74c6
commit d51ab36bbf
2 changed files with 30 additions and 11 deletions

View File

@@ -7,3 +7,7 @@ export function isMacPlatform(platform: Platform) {
export function isWindowsPlatform(platform: Platform) { export function isWindowsPlatform(platform: Platform) {
return platform === Platform.WindowsDesktop || platform === Platform.WindowsWeb return platform === Platform.WindowsDesktop || platform === Platform.WindowsWeb
} }
export function isMobilePlatform(platform: Platform) {
return platform === Platform.Ios || platform === Platform.Android
}

View File

@@ -1,4 +1,10 @@
import { PlatformedKeyboardShortcut, keyboardCharacterForModifier, isMacPlatform } from '@standardnotes/ui-services' import {
PlatformedKeyboardShortcut,
keyboardCharacterForModifier,
isMacPlatform,
isMobilePlatform,
} from '@standardnotes/ui-services'
import { useMemo } from 'react'
type Props = { type Props = {
shortcut: PlatformedKeyboardShortcut shortcut: PlatformedKeyboardShortcut
@@ -6,22 +12,31 @@ type Props = {
} }
export const KeyboardShortcutIndicator = ({ shortcut, className }: Props) => { export const KeyboardShortcutIndicator = ({ shortcut, className }: Props) => {
const modifiers = shortcut.modifiers || []
const primaryKey = (shortcut.key || '').toUpperCase()
const addPluses = !isMacPlatform(shortcut.platform) const addPluses = !isMacPlatform(shortcut.platform)
const spacingClass = addPluses ? '' : 'ml-0.5' const spacingClass = addPluses ? '' : 'ml-0.5'
const keys: string[] = [] const keys = useMemo(() => {
modifiers.forEach((modifier, index) => { const modifiers = shortcut.modifiers || []
keys.push(keyboardCharacterForModifier(modifier, shortcut.platform)) const primaryKey = (shortcut.key || '').toUpperCase()
if (addPluses && (primaryKey || index !== modifiers.length - 1)) { const results: string[] = []
keys.push('+') modifiers.forEach((modifier, index) => {
results.push(keyboardCharacterForModifier(modifier, shortcut.platform))
if (addPluses && (primaryKey || index !== modifiers.length - 1)) {
results.push('+')
}
})
if (primaryKey) {
results.push(primaryKey)
} }
})
if (primaryKey) { return results
keys.push(primaryKey) }, [shortcut, addPluses])
if (isMobilePlatform(shortcut.platform)) {
return null
} }
return ( return (