Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: remove legacy alignment

Browse Source
This commit is contained in:
Vincent Chan 2022-08-31 18:06:41 +08:00
parent 14c1959d63
commit 4c31c0dcf0
13 changed files with 71 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_cell.dart
View File

@ -63,8 +63,6 @@ class _DateCellState extends GridCellState<GridDateCell> {
builder: (context, state) {
return Popover(
controller: _popover,
targetAnchor: Alignment.bottomLeft,
followerAnchor: Alignment.topLeft,
offset: const Offset(0, 20),
child: SizedBox.expand(
child: GestureDetector(

6
frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart
View File

@ -306,8 +306,6 @@ class _DateTypeOptionButton extends StatelessWidget {
return Popover(
triggerActions:
PopoverTriggerActionFlags.hover | PopoverTriggerActionFlags.click,
targetAnchor: Alignment.topRight,
followerAnchor: Alignment.topLeft,
offset: const Offset(20, 0),
child: FlowyButton(
text: FlowyText.medium(title, fontSize: 12),
@ -353,8 +351,6 @@ class _CalDateTimeSettingState extends State<_CalDateTimeSetting> {
triggerActions:
PopoverTriggerActionFlags.hover | PopoverTriggerActionFlags.click,
child: const DateFormatButton(),
targetAnchor: Alignment.topRight,
followerAnchor: Alignment.topLeft,
offset: const Offset(20, 0),
popupBuilder: (BuildContext context) {
return OverlayContainer(
@ -372,8 +368,6 @@ class _CalDateTimeSettingState extends State<_CalDateTimeSetting> {
triggerActions:
PopoverTriggerActionFlags.hover | PopoverTriggerActionFlags.click,
child: TimeFormatButton(timeFormat: widget.dateTypeOptionPB.timeFormat),
targetAnchor: Alignment.topRight,
followerAnchor: Alignment.topLeft,
offset: const Offset(20, 0),
popupBuilder: (BuildContext context) {
return OverlayContainer(

2
frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dart
View File

@ -197,8 +197,6 @@ class _SelectOptionWrapState extends State<SelectOptionWrap> {
Popover(
controller: _popover,
child: child,
targetAnchor: Alignment.bottomCenter,
followerAnchor: Alignment.topCenter,
offset: const Offset(0, 20),
popupBuilder: (BuildContext context) {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {

2
frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_cell.dart
View File

@ -39,8 +39,6 @@ class _GridFieldCellState extends State<GridFieldCell> {
field: state.field,
onTap: () => popover.show(),
),
targetAnchor: Alignment.bottomLeft,
followerAnchor: Alignment.topLeft,
offset: const Offset(0, 10),
popupBuilder: (BuildContext context) {
return GridFieldCellActionSheet(

2
frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/field_type_option_editor.dart
View File

@ -69,8 +69,6 @@ class FieldTypeOptionEditor extends StatelessWidget {
PopoverTriggerActionFlags.hover | PopoverTriggerActionFlags.click,
mutex: popoverMutex,
offset: const Offset(20, 0),
targetAnchor: Alignment.topRight,
followerAnchor: Alignment.topLeft,
popupBuilder: (context) {
final list = FieldTypeList(onSelectField: (newFieldType) {
dataController.switchToField(newFieldType);

24
frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/date.dart
View File

@ -67,8 +67,6 @@ class DateTypeOptionWidget extends TypeOptionWidget {
triggerActions:
PopoverTriggerActionFlags.hover | PopoverTriggerActionFlags.click,
child: const DateFormatButton(),
targetAnchor: Alignment.topRight,
followerAnchor: Alignment.topLeft,
offset: const Offset(20, 0),
popupBuilder: (popoverContext) {
return OverlayContainer(
@ -92,19 +90,19 @@ class DateTypeOptionWidget extends TypeOptionWidget {
triggerActions:
PopoverTriggerActionFlags.hover | PopoverTriggerActionFlags.click,
child: TimeFormatButton(timeFormat: timeFormat),
targetAnchor: Alignment.topRight,
followerAnchor: Alignment.topLeft,
offset: const Offset(20, 0),
popupBuilder: (BuildContext context) {
popupBuilder: (BuildContext popoverContext) {
return OverlayContainer(
constraints: BoxConstraints.loose(const Size(460, 440)),
child: TimeFormatList(
selectedFormat: timeFormat,
onSelected: (format) {
context
.read<DateTypeOptionBloc>()
.add(DateTypeOptionEvent.didSelectTimeFormat(format));
}));
constraints: BoxConstraints.loose(const Size(460, 440)),
child: TimeFormatList(
selectedFormat: timeFormat,
onSelected: (format) {
context
.read<DateTypeOptionBloc>()
.add(DateTypeOptionEvent.didSelectTimeFormat(format));
PopoverContainerState.of(popoverContext).close();
}),
);
},
);
}

2
frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/number.dart
View File

@ -63,8 +63,6 @@ class NumberTypeOptionWidget extends TypeOptionWidget {
mutex: popoverMutex,
triggerActions: PopoverTriggerActionFlags.hover |
PopoverTriggerActionFlags.click,
targetAnchor: Alignment.topRight,
followerAnchor: Alignment.topLeft,
offset: const Offset(20, 0),
child: FlowyButton(
margin: GridSize.typeOptionContentInsets,

2
frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dart
View File

@ -167,8 +167,6 @@ class _RowDetailCellState extends State<_RowDetailCell> {
width: 150,
child: Popover(
controller: popover,
targetAnchor: Alignment.topRight,
followerAnchor: Alignment.topLeft,
offset: const Offset(20, 0),
popupBuilder: (context) {
return OverlayContainer(

2
frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dart
View File

@ -96,8 +96,6 @@ class _GridPropertyCell extends StatelessWidget {
Widget _editFieldButton(AppTheme theme, BuildContext context) {
return Popover(
triggerActions: PopoverTriggerActionFlags.click,
targetAnchor: Alignment.topRight,
followerAnchor: Alignment.topLeft,
offset: const Offset(20, 0),
child: FlowyButton(
text: FlowyText.medium(field.name, fontSize: 12),

2
frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dart
View File

@ -55,8 +55,6 @@ class _SettingButton extends StatelessWidget {
final theme = context.watch<AppTheme>();
return Popover(
triggerActions: PopoverTriggerActionFlags.click,
targetAnchor: Alignment.bottomLeft,
followerAnchor: Alignment.topLeft,
offset: const Offset(0, 10),
child: FlowyIconButton(
width: 22,

6
frontend/app_flowy/packages/appflowy_popover/example/lib/example_button.dart
View File

@ -22,8 +22,6 @@ class _PopoverMenuState extends State<PopoverMenu> {
PopoverTriggerActionFlags.hover | PopoverTriggerActionFlags.click,
mutex: popOverMutex,
offset: const Offset(10, 0),
targetAnchor: Alignment.topRight,
followerAnchor: Alignment.topLeft,
popupBuilder: (BuildContext context) {
return PopoverMenu();
},
@ -37,8 +35,6 @@ class _PopoverMenuState extends State<PopoverMenu> {
PopoverTriggerActionFlags.hover | PopoverTriggerActionFlags.click,
mutex: popOverMutex,
offset: const Offset(10, 0),
targetAnchor: Alignment.topRight,
followerAnchor: Alignment.topLeft,
popupBuilder: (BuildContext context) {
return PopoverMenu();
},
@ -69,8 +65,6 @@ class ExampleButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Popover(
targetAnchor: targetAnchor,
followerAnchor: followerAnchor,
triggerActions: PopoverTriggerActionFlags.click,
offset: offset,
child: TextButton(child: Text(label), onPressed: () {}),

6
frontend/app_flowy/packages/appflowy_popover/lib/layout.dart
View File

@ -6,10 +6,12 @@ import './popover.dart';
class PopoverLayoutDelegate extends SingleChildLayoutDelegate {
PopoverLink link;
PopoverDirection direction;
final Offset offset;
PopoverLayoutDelegate({
required this.link,
required this.direction,
required this.offset,
});
@override
@ -165,8 +167,8 @@ class PopoverLayoutDelegate extends SingleChildLayoutDelegate {
return Offset.zero;
}
final anchorRect = Rect.fromLTWH(
link.leaderOffset!.dx,
link.leaderOffset!.dy,
link.leaderOffset!.dx + offset.dx,
link.leaderOffset!.dy + offset.dy,
link.leaderSize!.width,
link.leaderSize!.height,
);

69
frontend/app_flowy/packages/appflowy_popover/lib/popover.dart
View File

@ -1,3 +1,5 @@
import 'dart:ui';
import 'package:appflowy_popover/layout.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
@ -55,8 +57,6 @@ class Popover extends StatefulWidget {
final PopoverController? controller;
final Offset? offset;
final Decoration? maskDecoration;
final Alignment targetAnchor;
final Alignment followerAnchor;
final Widget Function(BuildContext context) popupBuilder;
final int triggerActions;
final PopoverMutex? mutex;
@ -70,8 +70,6 @@ class Popover extends StatefulWidget {
this.controller,
this.offset,
this.maskDecoration,
this.targetAnchor = Alignment.topLeft,
this.followerAnchor = Alignment.topLeft,
this.triggerActions = 0,
this.direction = PopoverDirection.rightWithTopAligned,
this.mutex,
@ -124,15 +122,13 @@ class PopoverState extends State<Popover> {
));
}
children.add(
CustomSingleChildLayout(
delegate: PopoverLayoutDelegate(
direction: widget.direction,
link: popoverLink,
),
child: widget.popupBuilder(context),
),
);
children.add(PopoverContainer(
direction: widget.direction,
popoverLink: popoverLink,
offset: widget.offset ?? Offset.zero,
popupBuilder: widget.popupBuilder,
onClose: () => close(),
));
return Stack(children: children);
});
@ -244,3 +240,50 @@ class _PopoverMaskState extends State<_PopoverMask> {
);
}
}
class PopoverContainer extends StatefulWidget {
final Widget Function(BuildContext context) popupBuilder;
final PopoverDirection direction;
final PopoverLink popoverLink;
final Offset offset;
final void Function() onClose;
const PopoverContainer({
Key? key,
required this.popupBuilder,
required this.direction,
required this.popoverLink,
required this.offset,
required this.onClose,
}) : super(key: key);
@override
State<StatefulWidget> createState() => PopoverContainerState();
}
class PopoverContainerState extends State<PopoverContainer> {
@override
Widget build(BuildContext context) {
return CustomSingleChildLayout(
delegate: PopoverLayoutDelegate(
direction: widget.direction,
link: widget.popoverLink,
offset: widget.offset,
),
child: widget.popupBuilder(context),
);
}
close() {
widget.onClose();
}
static PopoverContainerState of(BuildContext context) {
if (context is StatefulElement && context.state is PopoverContainerState) {
return context.state as PopoverContainerState;
}
final PopoverContainerState? result =
context.findAncestorStateOfType<PopoverContainerState>();
return result!;
}
}