diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 5dfbae23c6..543f380686 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -2,7 +2,7 @@ Thank you for investing your time in contributing to our project! Any contribution you make will be reflected on our GitHub :sparkles:. -Read our [Code of Conduct](./CODE_OF_CONDUCT.md) to keep our community approachable and respectable. Join our [dicord](https://discord.com/invite/yz6tGVsf5p) server for more. +Read our [Code of Conduct](./CODE_OF_CONDUCT.md) to keep our community approachable and respectable. Join our [Discord](https://discord.com/invite/yz6tGVsf5p) server for more. In this guide you will get an overview of the contribution workflow from opening an issue, creating a PR, reviewing, and merging the PR. diff --git a/libs/components/editor-blocks/src/blocks/group/group-menu/MainMenu.tsx b/libs/components/editor-blocks/src/blocks/group/group-menu/MainMenu.tsx index 92aa53566e..43b819aabe 100644 --- a/libs/components/editor-blocks/src/blocks/group/group-menu/MainMenu.tsx +++ b/libs/components/editor-blocks/src/blocks/group/group-menu/MainMenu.tsx @@ -82,7 +82,7 @@ const GroupMenuWrapper = ({ content={ - + {/**/} { // // Closed beta period temporarily // filterSorterFlag && ( diff --git a/libs/components/editor-core/package.json b/libs/components/editor-core/package.json index b680b35b96..e65db73f18 100644 --- a/libs/components/editor-core/package.json +++ b/libs/components/editor-core/package.json @@ -13,5 +13,8 @@ "nanoid": "^4.0.0", "slate": "^0.81.0", "style9": "^0.14.0" + }, + "devDependencies": { + "@types/html-escaper": "^3.0.0" } } diff --git a/libs/components/editor-plugins/src/menu/inline-menu/config.ts b/libs/components/editor-plugins/src/menu/inline-menu/config.ts index 8cad7e7a9a..99c7ed1757 100644 --- a/libs/components/editor-plugins/src/menu/inline-menu/config.ts +++ b/libs/components/editor-plugins/src/menu/inline-menu/config.ts @@ -12,13 +12,20 @@ export const INLINE_MENU_UI_TYPES = { } as const; /** inline menu item { key : display-name } */ -export const inlineMenuShortcuts = { +export const MacInlineMenuShortcuts = { textBold: '⌘+B', textItalic: '⌘+I', textStrikethrough: '⌘+S', link: '⌘+K', [Protocol.Block.Type.code]: '⌘+E', }; +export const WinInlineMenuShortcuts = { + textBold: 'Ctrl+B', + textItalic: 'Ctrl+I', + textStrikethrough: 'Ctrl+S', + link: 'Ctrl+K', + [Protocol.Block.Type.code]: 'Ctrl+E', +}; export const inlineMenuNames = { currentText: 'TEXT SIZE', [Protocol.Block.Type.heading1]: 'Heading 1', diff --git a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx index 80df07e413..c7a34fb6fb 100644 --- a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx +++ b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx @@ -1,22 +1,24 @@ -import React, { useState, useCallback } from 'react'; -import style9 from 'style9'; -import { - Popover, - styled, - type SvgIconProps, - Tooltip, -} from '@toeverything/components/ui'; import { fontBgColorPalette, fontColorPalette, } from '@toeverything/components/common'; import { ArrowDropDownIcon } from '@toeverything/components/icons'; -import type { DropdownItemType, WithEditorSelectionType } from '../types'; import { - inlineMenuNamesKeys, + Popover, + styled, + Tooltip, + type SvgIconProps, +} from '@toeverything/components/ui'; +import { uaHelper } from '@toeverything/utils'; +import { useCallback, useState } from 'react'; +import style9 from 'style9'; +import { inlineMenuNamesForFontColor, - inlineMenuShortcuts, + inlineMenuNamesKeys, + MacInlineMenuShortcuts, + WinInlineMenuShortcuts, } from '../config'; +import type { DropdownItemType, WithEditorSelectionType } from '../types'; type MenuDropdownItemProps = DropdownItemType & WithEditorSelectionType; @@ -36,102 +38,100 @@ export const MenuDropdownItem = ({ set_anchor_ele(null); }, []); - //@ts-ignore - const shortcut = inlineMenuShortcuts[nameKey]; + const shortcut = uaHelper.isMacOs + ? //@ts-ignore + MacInlineMenuShortcuts[nameKey] + : //@ts-ignore + WinInlineMenuShortcuts[nameKey]; return ( - <> - + {children.map(item => { + const { + name, + icon: ItemIcon, + onClick, + nameKey: itemNameKey, + } = item; + + const StyledIcon = withStylesForIcon(ItemIcon); + + return ( + + ); + })} + + } + > + - {children.map(item => { - const { - name, - icon: ItemIcon, - onClick, - nameKey: itemNameKey, - } = item; - - const StyledIcon = withStylesForIcon(ItemIcon); - - return ( - - ); - })} +
+

{name}

+ {shortcut &&

{shortcut}

}
} + placement="top" + trigger="hover" > - -

{name}

- {shortcut &&

{shortcut}

} - - } - placement="top" - trigger="hover" + -
-
- + + + + + ); }; diff --git a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx index 6d6f6384bd..bd3a13bf8d 100644 --- a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx +++ b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx @@ -1,7 +1,8 @@ import { Tooltip } from '@toeverything/components/ui'; +import { uaHelper } from '@toeverything/utils'; import React, { useCallback } from 'react'; import style9 from 'style9'; -import { inlineMenuNamesKeys, inlineMenuShortcuts } from '../config'; +import { inlineMenuNamesKeys, WinInlineMenuShortcuts } from '../config'; import type { IconItemType, WithEditorSelectionType } from '../types'; type MenuIconItemProps = IconItemType & WithEditorSelectionType; @@ -36,7 +37,11 @@ export const MenuIconItem = ({ ); //@ts-ignore - const shortcut = inlineMenuShortcuts[nameKey]; + const shortcut = uaHelper.isMacOs + ? //@ts-ignore + MacInlineMenuShortcuts[nameKey] + : //@ts-ignore + WinInlineMenuShortcuts[nameKey]; return ( { @@ -51,7 +51,6 @@ export const LayoutHeader = () => { - {t('Share')}
{ - - {warningTips} - ); }; diff --git a/libs/components/layout/src/header/PageSettingPortal.tsx b/libs/components/layout/src/header/PageSettingPortal.tsx index 9defcf754d..115b5c95fd 100644 --- a/libs/components/layout/src/header/PageSettingPortal.tsx +++ b/libs/components/layout/src/header/PageSettingPortal.tsx @@ -58,8 +58,6 @@ function PageSettingPortal() { const navigate = useNavigate(); const { user } = useUserAndSpaces(); const BooleanFullWidthChecked = useFlag('BooleanFullWidthChecked', false); - const BooleanExportWorkspace = useFlag('BooleanExportWorkspace', false); - const BooleanImportWorkspace = useFlag('BooleanImportWorkspace', false); const BooleanExportHtml = useFlag('BooleanExportHtml', false); const BooleanExportPdf = useFlag('BooleanExportPdf', false); const BooleanExportMarkdown = useFlag('BooleanExportMarkdown', false); @@ -217,18 +215,14 @@ function PageSettingPortal() { /> )} - {BooleanImportWorkspace && ( - - )} - {BooleanExportWorkspace && ( - - )} + +

Last edited by {user && user.nickname} diff --git a/libs/components/layout/src/settings-sidebar/Settings/SettingsList.tsx b/libs/components/layout/src/settings-sidebar/Settings/SettingsList.tsx index a4c99c6fe0..f462ccf572 100644 --- a/libs/components/layout/src/settings-sidebar/Settings/SettingsList.tsx +++ b/libs/components/layout/src/settings-sidebar/Settings/SettingsList.tsx @@ -49,7 +49,7 @@ export const SettingsList = () => { {item.key === 'Language' ? (