IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Files: fixed hotkey symbol for macOS

Browse Source
This commit is contained in:
Nikita Gopienko 2022-02-10 14:25:03 +03:00
parent 0d302d5549
commit 655c0e9122
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
products/ASC.Files/Client/src/components/panels/HotkeysPanel/ActionsBlock.js
View File

@ -2,7 +2,7 @@ import React from "react";
import Row from "@appserver/components/row";
import Text from "@appserver/components/text";
const ActionsBlock = ({ t, textStyles, keyTextStyles }) => {
const ActionsBlock = ({ t, textStyles, keyTextStyles, CtrlKey }) => {
return (
<>
<Row className="hotkeys_row">
@ -20,13 +20,13 @@ const ActionsBlock = ({ t, textStyles, keyTextStyles }) => {
<Row className="hotkeys_row">
<>
<Text {...textStyles}>{t("HotkeysUndoLastAction")}</Text>
<Text {...keyTextStyles}>Ctrl+z</Text>
<Text {...keyTextStyles}>{CtrlKey}+z</Text>
</>
</Row>
<Row className="hotkeys_row">
<>
<Text {...textStyles}>{t("HotkeysRedoLastUndoneAction")}</Text>
<Text {...keyTextStyles}>Ctrl+Shift+z</Text>
<Text {...keyTextStyles}>{CtrlKey}+Shift+z</Text>
</>
</Row>
</>

6
products/ASC.Files/Client/src/components/panels/HotkeysPanel/ApplicationActionsBlock.js
View File

@ -2,13 +2,15 @@ import React from "react";
import Row from "@appserver/components/row";
import Text from "@appserver/components/text";
const ApplicationActionsBlock = ({ t, textStyles, keyTextStyles }) => {
const ApplicationActionsBlock = ({ t, textStyles, keyTextStyles, CtrlKey }) => {
return (
<>
<Row className="hotkeys_row">
<>
<Text {...textStyles}>{t("HotkeysShortcuts")}</Text>
<Text {...keyTextStyles}>? {t("HotkeysOr")} Ctrl+/</Text>
<Text {...keyTextStyles}>
? {t("HotkeysOr")} {CtrlKey}+/
</Text>
</>
</Row>
</>

10
products/ASC.Files/Client/src/components/panels/HotkeysPanel/MoveBlock.js
View File

@ -2,31 +2,31 @@ import React from "react";
import Row from "@appserver/components/row";
import Text from "@appserver/components/text";
const MoveBlock = ({ t, textStyles, keyTextStyles }) => {
const MoveBlock = ({ t, textStyles, keyTextStyles, CtrlKey }) => {
return (
<>
<Row className="hotkeys_row">
<>
<Text {...textStyles}>{t("HotkeysMoveDown")}</Text>
<Text {...keyTextStyles}>Ctrl+↓</Text>
<Text {...keyTextStyles}>{CtrlKey}+↓</Text>
</>
</Row>
<Row className="hotkeys_row">
<>
<Text {...textStyles}>{t("HotkeysMoveUp")}</Text>
<Text {...keyTextStyles}>Ctrl+↑</Text>
<Text {...keyTextStyles}>{CtrlKey}+↑</Text>
</>
</Row>
<Row className="hotkeys_row">
<>
<Text {...textStyles}>{t("HotkeysMoveLeft")}</Text>
<Text {...keyTextStyles}>Ctrl+←</Text>
<Text {...keyTextStyles}>{CtrlKey}+←</Text>
</>
</Row>
<Row className="hotkeys_row">
<>
<Text {...textStyles}>{t("HotkeysMoveRight")}</Text>
<Text {...keyTextStyles}>Ctrl+→</Text>
<Text {...keyTextStyles}>{CtrlKey}+→</Text>
</>
</Row>
</>

6
products/ASC.Files/Client/src/components/panels/HotkeysPanel/index.js
View File

@ -10,6 +10,7 @@ import MoveBlock from "./MoveBlock";
import ActionsBlock from "./ActionsBlock";
import ApplicationActionsBlock from "./ApplicationActionsBlock";
import PreviewActionsBlock from "./PreviewActionsBlock";
import { isMacOs } from "react-device-detect";
const HotkeyPanel = ({ visible, setHotkeyPanelVisible, t, tReady }) => {
const onClose = () => setHotkeyPanelVisible(false);
@ -23,6 +24,8 @@ const HotkeyPanel = ({ visible, setHotkeyPanelVisible, t, tReady }) => {
...{ color: "#657077", className: "hotkeys-key" },
};
const CtrlKey = isMacOs ? "⌘" : "Ctrl";
const onKeyPress = (e) =>
(e.key === "Esc" || e.key === "Escape") && onClose();
@ -54,6 +57,7 @@ const HotkeyPanel = ({ visible, setHotkeyPanelVisible, t, tReady }) => {
t={t}
textStyles={textStyles}
keyTextStyles={keyTextStyles}
CtrlKey={CtrlKey}
/>
<Heading className="hotkeys_sub-header">
@ -63,6 +67,7 @@ const HotkeyPanel = ({ visible, setHotkeyPanelVisible, t, tReady }) => {
t={t}
textStyles={textStyles}
keyTextStyles={keyTextStyles}
CtrlKey={CtrlKey}
/>
<Heading className="hotkeys_sub-header">
{t("HotkeysApplicationActions")}
@ -71,6 +76,7 @@ const HotkeyPanel = ({ visible, setHotkeyPanelVisible, t, tReady }) => {
t={t}
textStyles={textStyles}
keyTextStyles={keyTextStyles}
CtrlKey={CtrlKey}
/>
<Heading className="hotkeys_sub-header">