diff --git a/.github/workflows/appflowy_editor_test.yml b/.github/workflows/appflowy_editor_test.yml index c007259bf8..229ef85efd 100644 --- a/.github/workflows/appflowy_editor_test.yml +++ b/.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/**" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e3ca2c3a76..5881741061 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,10 +4,12 @@ on: push: branches: - "main" + - "release/*" pull_request: branches: - "main" + - "release/*" jobs: build: diff --git a/.github/workflows/dart_lint.yml b/.github/workflows/dart_lint.yml index 68b0a94350..678677e3d4 100644 --- a/.github/workflows/dart_lint.yml +++ b/.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/**" diff --git a/.github/workflows/dart_test.yml b/.github/workflows/dart_test.yml index 55efb0e7e1..39a938628e 100644 --- a/.github/workflows/dart_test.yml +++ b/.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/**" diff --git a/.github/workflows/rust_coverage.yml b/.github/workflows/rust_coverage.yml index b63d0c2202..512796cb93 100644 --- a/.github/workflows/rust_coverage.yml +++ b/.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/**" diff --git a/.github/workflows/rust_lint.yml b/.github/workflows/rust_lint.yml index 2221ad02a0..4ea8ba40a2 100644 --- a/.github/workflows/rust_lint.yml +++ b/.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/**" diff --git a/.github/workflows/rust_test.yml b/.github/workflows/rust_test.yml index 78763e7f10..3f49d5085b 100644 --- a/.github/workflows/rust_test.yml +++ b/.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/**" diff --git a/frontend/Makefile.toml b/frontend/Makefile.toml index e83749026f..55b20dea05 100644 --- a/frontend/Makefile.toml +++ b/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 diff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_upload_widget.dart b/frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_upload_widget.dart index 078609db91..a8909d16c5 100644 --- a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_upload_widget.dart +++ b/frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_upload_widget.dart @@ -98,7 +98,7 @@ class _ImageUploadMenuState extends State { color: Colors.black.withOpacity(0.1), ), ], - borderRadius: BorderRadius.circular(6.0), + // borderRadius: BorderRadius.circular(6.0), ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_service.dart b/frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_service.dart index 76e12a5f62..402e7cee84 100644 --- a/frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection_menu/selection_menu_service.dart +++ b/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: [