Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-11 20:08:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into payment-system

Browse Source
This commit is contained in:
Joooye_34
2023-10-27 16:04:48 +08:00
parent 87571a0879 9fc0152cb1
commit 385de7d33b
87 changed files with 1004 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/frontend/component/package.json
View File

@@ -63,12 +63,12 @@
"uuid": "^9.0.1"
},
"devDependencies": {
"@blocksuite/blocks": "0.0.0-20231018100009-361737d3-nightly",
"@blocksuite/editor": "0.0.0-20231018100009-361737d3-nightly",
"@blocksuite/global": "0.0.0-20231018100009-361737d3-nightly",
"@blocksuite/icons": "2.1.34",
"@blocksuite/lit": "0.0.0-20231018100009-361737d3-nightly",
"@blocksuite/store": "0.0.0-20231018100009-361737d3-nightly",
"@blocksuite/blocks": "0.0.0-20231024064721-2aee7119-nightly",
"@blocksuite/editor": "0.0.0-20231024064721-2aee7119-nightly",
"@blocksuite/global": "0.0.0-20231024064721-2aee7119-nightly",
"@blocksuite/icons": "2.1.35",
"@blocksuite/lit": "0.0.0-20231024064721-2aee7119-nightly",
"@blocksuite/store": "0.0.0-20231024064721-2aee7119-nightly",
"@storybook/jest": "^0.2.3",
"@storybook/testing-library": "^0.2.2",
"@testing-library/react": "^14.0.0",
@@ -84,5 +84,5 @@
"vitest": "0.34.6",
"yjs": "^13.6.8"
},
"version": "0.10.0-canary.2"
"version": "0.10.0-canary.3"
}

4
packages/frontend/component/src/components/affine-banner/browser-warning.tsx
View File

@@ -1,5 +1,5 @@
import { CloseIcon } from '@blocksuite/icons';
import type React from 'react';
import type { ReactNode } from 'react';
import {
browserWarningStyle,
@@ -14,7 +14,7 @@ export const BrowserWarning = ({
}: {
show: boolean;
onClose: () => void;
message: React.ReactNode;
message: ReactNode;
}) => {
if (!show) {
return null;

6
packages/frontend/component/src/components/share-menu/share-menu.tsx
View File

@@ -88,11 +88,7 @@ const CloudShareMenu = (props: ShareMenuProps) => {
modal: false,
}}
>
<Button
data-testid="cloud-share-menu-button"
type="plain"
onClick={() => console.log('gg')}
>
<Button data-testid="cloud-share-menu-button" type="plain">
<div
style={{
color: isSharedPage