Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/models/src/Domain/Abstract/Component/MessageData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,10 @@ export type MessageData = Partial<{
content_type?: string
/** Related to key-pressed action */
keyboardModifier?: KeyboardModifier
key?: string
code?: string
ctrlKey?: boolean
metaKey?: boolean
shiftKey?: boolean
altKey?: boolean
}>
11 changes: 11 additions & 0 deletions packages/ui-services/src/Keyboard/ComponentKeyboardEventInit.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export type ComponentKeyboardEventInit = Pick<
KeyboardEvent,
'key' | 'code' | 'ctrlKey' | 'metaKey' | 'shiftKey' | 'altKey'
>

export function isComponentKeyboardEventInit(data: {
key?: string
code?: string
}): data is ComponentKeyboardEventInit {
return data.key !== undefined && data.code !== undefined
}
7 changes: 7 additions & 0 deletions packages/ui-services/src/Keyboard/KeyboardService.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Environment, Platform, UuidGenerator } from '@standardnotes/snjs'
import { ComponentKeyboardEventInit } from './ComponentKeyboardEventInit'
import { eventMatchesKeyAndModifiers } from './eventMatchesKeyAndModifiers'
import { KeyboardCommand } from './KeyboardCommands'
import { KeyboardKeyEvent } from './KeyboardKeyEvent'
Expand Down Expand Up @@ -101,6 +102,12 @@ export class KeyboardService {
this.removeActiveModifier(modifier)
}

public handleComponentKeyboardEvent = (eventInit: ComponentKeyboardEventInit, keyEvent: KeyboardKeyEvent): void => {
const event = new KeyboardEvent(keyEvent === KeyboardKeyEvent.Down ? 'keydown' : 'keyup', eventInit)
this.updateAllModifiersFromEvent(event)
this.handleKeyboardEvent(event, keyEvent)
}

private handleKeyDown = (event: KeyboardEvent): void => {
this.updateAllModifiersFromEvent(event)

Expand Down
2 changes: 2 additions & 0 deletions packages/ui-services/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ export * from './Changelog/ChangelogServiceInterface'
export * from './Keyboard/KeyboardService'
export * from './Keyboard/KeyboardShortcut'
export * from './Keyboard/KeyboardCommands'
export * from './Keyboard/KeyboardKeyEvent'
export * from './Keyboard/ComponentKeyboardEventInit'
export * from './Keyboard/platformCheck'
export * from './Keyboard/KeyboardKey'
export * from './Keyboard/KeyboardModifier'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
ComponentInterface,
SubscriptionManagerEvent,
} from '@standardnotes/snjs'
import { KeyboardKeyEvent, type KeyboardModifier } from '@standardnotes/ui-services'
import { FunctionComponent, useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { observer } from 'mobx-react-lite'
import OfflineRestricted from '@/Components/ComponentView/OfflineRestricted'
Expand Down Expand Up @@ -153,12 +154,50 @@ const IframeFeatureView: FunctionComponent<Props> = ({

useEffect(() => {
const removeActionObserver = componentViewer.addActionObserver((action, data) => {
const keyboardData = data as {
key?: string
code?: string
ctrlKey?: boolean
metaKey?: boolean
shiftKey?: boolean
altKey?: boolean
keyboardModifier?: KeyboardModifier
}

switch (action) {
case ComponentAction.KeyDown:
application.keyboardService.handleComponentKeyDown(data.keyboardModifier)
if (keyboardData.key !== undefined && keyboardData.code !== undefined) {
application.keyboardService.handleComponentKeyboardEvent(
{
key: keyboardData.key,
code: keyboardData.code,
ctrlKey: keyboardData.ctrlKey ?? false,
metaKey: keyboardData.metaKey ?? false,
shiftKey: keyboardData.shiftKey ?? false,
altKey: keyboardData.altKey ?? false,
},
KeyboardKeyEvent.Down,
)
} else {
application.keyboardService.handleComponentKeyDown(keyboardData.keyboardModifier)
}
break
case ComponentAction.KeyUp:
application.keyboardService.handleComponentKeyUp(data.keyboardModifier)
if (keyboardData.key !== undefined && keyboardData.code !== undefined) {
application.keyboardService.handleComponentKeyboardEvent(
{
key: keyboardData.key,
code: keyboardData.code,
ctrlKey: keyboardData.ctrlKey ?? false,
metaKey: keyboardData.metaKey ?? false,
shiftKey: keyboardData.shiftKey ?? false,
altKey: keyboardData.altKey ?? false,
},
KeyboardKeyEvent.Up,
)
} else {
application.keyboardService.handleComponentKeyUp(keyboardData.keyboardModifier)
}
break
case ComponentAction.Click:
application.notesController.setContextMenuOpen(false)
Expand Down
Loading