wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-27 02:42:11 +00:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

UBER-429 Improve keyboard help ()

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-06-07 20:04:28 +06:00 committed by GitHub
parent 8ccb61ab64
commit 91bbed00d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 14 deletions
models
board/src
index.ts
hr/src
index.ts
recruit/src
index.ts
setting/src
index.ts
tracker/src
index.ts
view/src
index.ts
plugins
view-resources/src/components
ActionHandler.svelteActionsPopup.svelte
workbench-resources/src/components
HelpAndSupport.svelte

2
models/board/src/index.ts
View File

@ -452,7 +452,7 @@ export function createModel (builder: Builder): void {
},
label: view.string.Delete,
icon: view.icon.Delete,
keyBinding: ['Meta + Backspace', 'Ctrl + Backspace'],
keyBinding: ['Meta + Backspace'],
category: board.category.Card,
input: 'any',
target: board.class.Card,

2
models/hr/src/index.ts
View File

@ -334,7 +334,7 @@ export function createModel (builder: Builder): void {
icon: view.icon.Archive,
input: 'any',
category: hr.category.HR,
keyBinding: ['Meta + Backspace', 'Ctrl + Backspace'],
keyBinding: ['Meta + Backspace'],
query: {
'members.length': 0,
_id: { $nin: [hr.ids.Head] }

2
models/recruit/src/index.ts
View File

@ -1073,7 +1073,7 @@ export function createModel (builder: Builder): void {
})
}
createGotoSpecialAction(builder, talentsId, 'keyG-keyE', recruit.string.GotoTalents)
createGotoSpecialAction(builder, talentsId, 'keyG->keyE', recruit.string.GotoTalents)
createGotoSpecialAction(builder, vacanciesId, 'keyG->keyV', recruit.string.GotoVacancies)
createGotoSpecialAction(builder, skillsId, 'keyG->keyS', recruit.string.GotoSkills)
createGotoSpecialAction(builder, myApplicationsId, 'keyG->keyM', recruit.string.GotoMyApplications)

2
models/setting/src/index.ts
View File

@ -390,7 +390,7 @@ export function createModel (builder: Builder): void {
action: setting.actionImpl.DeleteMixin,
label: view.string.Delete,
icon: view.icon.Delete,
keyBinding: ['Meta + Backspace', 'Ctrl + Backspace'],
keyBinding: ['Meta + Backspace'],
category: view.category.General,
input: 'any',
target: setting.mixin.UserMixin,

2
models/tracker/src/index.ts
View File

@ -1883,7 +1883,7 @@ export function createModel (builder: Builder): void {
action: tracker.actionImpl.DeleteMilestone,
label: view.string.Delete,
icon: view.icon.Delete,
keyBinding: ['Meta + Backspace', 'Ctrl + Backspace'],
keyBinding: ['Meta + Backspace'],
category: tracker.category.Tracker,
input: 'any',
target: tracker.class.Milestone,

6
models/view/src/index.ts
View File

@ -561,7 +561,7 @@ export function createModel (builder: Builder): void {
action: view.actionImpl.Delete,
label: view.string.Delete,
icon: view.icon.Delete,
keyBinding: ['Meta + Backspace', 'Ctrl + Backspace'],
keyBinding: ['Meta + Backspace'],
category: view.category.General,
input: 'any',
target: core.class.Doc,
@ -669,7 +669,7 @@ export function createModel (builder: Builder): void {
{
label: view.string.SelectItemAll,
action: view.actionImpl.SelectItemAll,
keyBinding: ['meta + keyA', 'ctrl + keyA'],
keyBinding: ['Meta + keyA'],
category: view.category.General,
input: 'none',
target: core.class.Doc,
@ -697,7 +697,7 @@ export function createModel (builder: Builder): void {
{
action: view.actionImpl.ShowActions,
label: view.string.ShowActions,
keyBinding: ['meta + keyK', 'ctrl + keyK'],
keyBinding: ['Meta + keyK'],
category: view.category.GeneralNavigation,
input: 'none',
target: core.class.Doc,

4
plugins/view-resources/src/components/ActionHandler.svelte
View File

@ -63,12 +63,14 @@
$: mode = $contextStore.getLastContext()?.mode
$: application = $contextStore.getLastContext()?.application
const isMac = /Macintosh/i.test(navigator.userAgent)
function keyPrefix (key: KeyboardEvent): string {
return (
(key.altKey ? 'Alt + ' : '') +
(key.shiftKey ? 'Shift + ' : '') +
(key.metaKey ? 'Meta + ' : '') +
(key.ctrlKey ? 'Ctrl + ' : '')
(key.ctrlKey ? (isMac ? 'Ctrl + ' : 'Meta + ') : '')
)
}
function m (s1: string, s2: string): boolean {

8
plugins/view-resources/src/components/ActionsPopup.svelte
View File

@ -167,6 +167,10 @@
handleSelection(key, selection)
}
}
const capitalizeFirstLetter = (str: string): string => str.charAt(0).toUpperCase() + str.slice(1)
const isMac = /Macintosh/i.test(navigator.userAgent)
function formatKey (key: string): string[][] {
const thens = key.split('->')
const result: string[][] = []
@ -175,7 +179,7 @@
r.split('+').map((it) =>
it
.replaceAll('key', '')
.replaceAll(/Meta|meta/g, '⌘')
.replaceAll(/Meta|meta/g, isMac ? '⌘' : 'Ctrl')
.replaceAll('ArrowUp', '↑')
.replaceAll('ArrowDown', '↓')
.replaceAll('ArrowLeft', '←')
@ -300,7 +304,7 @@
{/if}
{#each k as kk, j}
<div class="flex-center text-sm key-box">
{kk}
{capitalizeFirstLetter(kk.trim())}
</div>
{/each}
{/each}

10
plugins/workbench-resources/src/components/HelpAndSupport.svelte
View File

@ -34,6 +34,8 @@
navigate(loc)
}
const capitalizeFirstLetter = (str: string): string => str.charAt(0).toUpperCase() + str.slice(1)
function formatKey (key: string): string[][] {
const thens = key.split('->')
const result: string[][] = []
@ -42,7 +44,7 @@
r.split('+').map((it) =>
it
.replaceAll('key', '')
.replaceAll(/Meta|meta/g, '⌘')
.replaceAll(/Meta|meta/g, isMac ? '⌘' : 'Ctrl')
.replaceAll('ArrowUp', '↑')
.replaceAll('ArrowDown', '↓')
.replaceAll('ArrowLeft', '←')
@ -78,7 +80,9 @@
actions.sort((a, b) => a.category.localeCompare(b.category))
}
$: getActions()
getActions()
const isMac = /Macintosh/i.test(navigator.userAgent)
const cards = [
{
@ -174,7 +178,7 @@
{/if}
{#each k as kk, j}
<div class="flex-center text-sm key-box">
{kk}
{capitalizeFirstLetter(kk.trim())}
</div>
{/each}
{/each}