chore: pick release/0.0.6 to main

This commit is contained in:
Lucas.Xu 2022-10-29 17:00:40 +08:00
parent 95fdfd7da2
commit 10541502b8
10 changed files with 19 additions and 4 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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