فهرست منبع

Merge pull request #1391 from LucasXu0/pick_0_0_6_1_to_main

chore: pick release/0.0.6 to main
Lucas.Xu 2 سال پیش
والد
کامیت
64b4a99aa1

+ 2 - 0
.github/workflows/appflowy_editor_test.yml

@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - "main"
+      - "release/*"
 
   pull_request:
     branches:
       - "main"
+      - "release/*"
     paths:
       - "frontend/app_flowy/packages/appflowy_editor/**"
 

+ 2 - 0
.github/workflows/ci.yaml

@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - "main"
+      - "release/*"
 
   pull_request:
     branches:
       - "main"
+      - "release/*"
 
 jobs:
   build:

+ 2 - 0
.github/workflows/dart_lint.yml

@@ -9,12 +9,14 @@ on:
   push:
     branches:
       - "main"
+      - "release/*"
     paths:
       - "frontend/app_flowy/**"
 
   pull_request:
     branches:
       - "main"
+      - "release/*"
     paths:
       - "frontend/app_flowy/**"
 

+ 2 - 0
.github/workflows/dart_test.yml

@@ -4,12 +4,14 @@ on:
   push:
     branches:
       - "main"
+      - "release/*"
     paths:
       - "frontend/app_flowy/**"
 
   pull_request:
     branches:
       - "main"
+      - "release/*"
     paths:
       - "frontend/app_flowy/**"
 

+ 2 - 0
.github/workflows/rust_coverage.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "main"
+      - "release/*"
     paths:
       - "frontend/rust-lib/**"
       - "shared-lib/**"
@@ -11,6 +12,7 @@ on:
   pull_request:
     branches:
       - "main"
+      - "release/*"
     paths:
       - "frontend/rust-lib/**"
       - "shared-lib/**"

+ 2 - 0
.github/workflows/rust_lint.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "main"
+      - "release/*"
     paths:
       - "frontend/rust-lib/**"
       - "shared-lib/**"
@@ -11,6 +12,7 @@ on:
   pull_request:
     branches:
       - "main"
+      - "release/*"
     paths:
       - "frontend/rust-lib/**"
       - "shared-lib/**"

+ 2 - 0
.github/workflows/rust_test.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "main"
+      - "release/*"
     paths:
       - "frontend/rust-lib/**"
       - "shared-lib/**"
@@ -11,6 +12,7 @@ on:
   pull_request:
     branches:
       - "main"
+      - "release/*"
     paths:
       - "frontend/rust-lib/**"
       - "shared-lib/**"

+ 1 - 1
frontend/Makefile.toml

@@ -22,7 +22,7 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 CARGO_MAKE_CRATE_FS_NAME = "dart_ffi"
 CARGO_MAKE_CRATE_NAME = "dart-ffi"
 LIB_NAME = "dart_ffi"
-CURRENT_APP_VERSION = "0.0.6"
+CURRENT_APP_VERSION = "0.0.6.1"
 FEATURES = "flutter"
 PRODUCT_NAME = "AppFlowy"
 # CRATE_TYPE: https://doc.rust-lang.org/reference/linkage.html

+ 1 - 1
frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_upload_widget.dart

@@ -98,7 +98,7 @@ class _ImageUploadMenuState extends State<ImageUploadMenu> {
             color: Colors.black.withOpacity(0.1),
           ),
         ],
-        borderRadius: BorderRadius.circular(6.0),
+        // borderRadius: BorderRadius.circular(6.0),
       ),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,

+ 3 - 2
frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_service.dart

@@ -60,7 +60,7 @@ class SelectionMenu implements SelectionMenuService {
     //  but the coordinates of overlay are not properly converted currently.
     //  Just subtract the padding here as a result.
     const menuHeight = 200.0;
-    const menuOffset = Offset(10, 10);
+    const menuOffset = Offset(0, 10);
     final editorOffset =
         editorState.renderBox?.localToGlobal(Offset.zero) ?? Offset.zero;
     final editorHeight = editorState.renderBox!.size.height;
@@ -81,7 +81,8 @@ class SelectionMenu implements SelectionMenuService {
     _selectionMenuEntry = OverlayEntry(builder: (context) {
       return Positioned(
         top: showBelow ? offset.dy : null,
-        bottom: showBelow ? null : editorHeight - offset.dy,
+        bottom:
+            showBelow ? null : MediaQuery.of(context).size.height - offset.dy,
         left: offset.dx,
         child: SelectionMenuWidget(
           items: [