diff --git a/.all-contributorsrc b/.all-contributorsrc index 8993984505..4b1cc35879 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -12,6 +12,16 @@ "contributorsPerLine": 7, "badgeTemplate": "\n[all-contributors-badge]: https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg?style=flat-square\n", "contributors": [ + { + "login": "doodlewind", + "name": "Yifeng Wang", + "avatar_url": "https://avatars.githubusercontent.com/u/7312949?v=4", + "profile": "https://github.com/doodlewind", + "contributions": [ + "code", + "doc" + ] + }, { "login": "darkskygit", "name": "DarkSky", @@ -303,6 +313,15 @@ "contributions": [ "code" ] + }, + { + "login": "felixonmars", + "name": "Felix Yan", + "avatar_url": "https://avatars.githubusercontent.com/u/1006477?v=4", + "profile": "https://felixc.at/", + "contributions": [ + "code" + ] } ] } diff --git a/README.md b/README.md index f46f41fca8..d4f92bc519 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ See https://github.com/all-?/all-contributors/issues/361#issuecomment-637166066 --> -[all-contributors-badge]: https://img.shields.io/badge/all_contributors-31-orange.svg?style=flat-square +[all-contributors-badge]: https://img.shields.io/badge/all_contributors-33-orange.svg?style=flat-square @@ -147,45 +147,47 @@ Thanks a lot to the community for providing such powerful and simple libraries, + - + - + - + - + +

Yifeng Wang
💻 📖
DarkSky
💻 📖
Chi Zhang
💻 📖
wang xinglong
💻 📖
DiamondThree
💻 📖
Whitewater
💻 📖
xiaodong zuo
💻 📖
MingLIang Wang
💻 📖

MingLIang Wang
💻 📖
Qi
💻 📖
mitsuhatu
💻 📖
Austaras
💻 📖
Jin Yao
💻 📖
HeJiachen-PM
📖
Yipei Wei
📖
fanjing22
🎨

fanjing22
🎨
Svaney
🎨
Guozhu Liu
🎨
fyZheng07
📋 📓
CJSS
📖
Carlos Rafael
💻
Caleb OLeary
💻
JimmFly
💻

JimmFly
💻
Weston Graham
📖
pointmax
📖
Bryan Lee
💻
Simon Li
💻
Bob Hu
💻
Quavo
📖
子瞻 Luci
💻

子瞻 Luci
💻
Horus
💻 📦
Super.x
💻
Wang Yu
💻
Felix Yan
💻
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 94806e00f8..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. +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. @@ -63,6 +63,8 @@ For more information about using a codespace for working on GitHub documentation Commit the changes once you are happy with them. +Reach out the community members for necessary help. + Once your changes are ready, don't forget to self-review to speed up the review process:zap:. ### Pull Request @@ -81,6 +83,6 @@ When you're finished with the changes, create a pull request, also known as a PR Congratulations :tada::tada: The AFFiNE team thanks you :sparkles:. -Once your PR is merged, your contributions will be publicly visible on the our GitHub. +Once your PR is merged, your contributions will be publicly visible on our GitHub. Now that you are part of the AFFiNE community, see how else you can join and help over at [Gitbook](https://docs.affine.pro/affine/) 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/menu-item/DropdownItem.tsx b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx index a8de5a36e0..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,24 +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 { uaHelper } from '@toeverything/utils'; 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, + inlineMenuNamesKeys, MacInlineMenuShortcuts, - WinInlineMenuShortcuts + WinInlineMenuShortcuts, } from '../config'; +import type { DropdownItemType, WithEditorSelectionType } from '../types'; type MenuDropdownItemProps = DropdownItemType & WithEditorSelectionType; @@ -38,102 +38,100 @@ export const MenuDropdownItem = ({ set_anchor_ele(null); }, []); - //@ts-ignore - const shortcut = uaHelper.isMacOs ? MacInlineMenuShortcuts[nameKey] : WinInlineMenuShortcuts[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 5ded472e7d..c49efd82a9 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,10 +1,14 @@ import React, { useCallback } from 'react'; import style9 from 'style9'; -import type { IconItemType, WithEditorSelectionType } from '../types'; -import { inlineMenuNamesKeys, MacInlineMenuShortcuts, WinInlineMenuShortcuts } from '../config'; import { Tooltip } from '@toeverything/components/ui'; import { uaHelper } from '@toeverything/utils'; +import { + inlineMenuNamesKeys, + MacInlineMenuShortcuts, + WinInlineMenuShortcuts, +} from '../config'; +import type { IconItemType, WithEditorSelectionType } from '../types'; type MenuIconItemProps = IconItemType & WithEditorSelectionType; export const MenuIconItem = ({ @@ -36,7 +40,11 @@ export const MenuIconItem = ({ ); //@ts-ignore - const shortcut = uaHelper.isMacOs ? MacInlineMenuShortcuts[nameKey] : WinInlineMenuShortcuts[nameKey]; + const shortcut = uaHelper.isMacOs + ? //@ts-ignore + MacInlineMenuShortcuts[nameKey] + : //@ts-ignore + WinInlineMenuShortcuts[nameKey]; return ( { @@ -44,7 +44,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' ? (