Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add same delete design in database #6620

Merged
merged 3 commits into from
Dec 9, 2024
Merged

feat: add same delete design in database #6620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cac2bec
add same delete design in database
Ahad-patel Oct 24, 2024
57c0e49
fix: remove padding when widget is null or function is null
Ahad-patel Oct 25, 2024
86b139c
Merge branch 'main' into fix-delete-button-design
Ahad-patel Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_editor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,22 +200,30 @@ class FieldActionCell extends StatelessWidget {
(action == FieldAction.duplicate || action == FieldAction.delete)) {
enable = false;
}

return FlowyButton(
return FlowyIconTextButton(
resetHoverOnRebuild: false,
disable: !enable,
text: FlowyText(
onHover: (_) => popoverMutex?.close(),
onTap: () => action.run(context, viewId, fieldInfo),
// show the error color when delete is hovered
textBuilder: (onHover) => FlowyText(
action.title(fieldInfo),
lineHeight: 1.0,
color: enable ? null : Theme.of(context).disabledColor,
color: enable
? action == FieldAction.delete && onHover
? Theme.of(context).colorScheme.error
: null
: Theme.of(context).disabledColor,
),
onHover: (_) => popoverMutex?.close(),
onTap: () => action.run(context, viewId, fieldInfo),
leftIcon: action.leading(
leftIconBuilder: (onHover) => action.leading(
fieldInfo,
enable ? null : Theme.of(context).disabledColor,
enable
? action == FieldAction.delete && onHover
? Theme.of(context).colorScheme.error
: null
: Theme.of(context).disabledColor,
),
rightIcon: action.trailing(context, fieldInfo),
rightIconBuilder: (_) => action.trailing(context, fieldInfo),
);
}
}
Expand Down
17 changes: 11 additions & 6 deletions frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ class FlowyIconTextButton extends StatelessWidget {
final VoidCallback? onSecondaryTap;
final void Function(bool)? onHover;
final EdgeInsets? margin;
final Widget Function(bool onHover)? leftIconBuilder;
final Widget Function(bool onHover)? rightIconBuilder;
final Widget? Function(bool onHover)? leftIconBuilder;
final Widget? Function(bool onHover)? rightIconBuilder;
final Color? hoverColor;
final bool isSelected;
final BorderRadius? radius;
Expand All @@ -30,6 +30,7 @@ class FlowyIconTextButton extends StatelessWidget {
final double iconPadding;
final bool expand;
final Color? borderColor;
final bool resetHoverOnRebuild;

const FlowyIconTextButton({
super.key,
Expand All @@ -54,6 +55,7 @@ class FlowyIconTextButton extends StatelessWidget {
this.iconPadding = 6,
this.expand = false,
this.borderColor,
this.resetHoverOnRebuild = true,
});

@override
Expand All @@ -65,6 +67,7 @@ class FlowyIconTextButton extends StatelessWidget {
onTap: disable ? null : onTap,
onSecondaryTap: disable ? null : onSecondaryTap,
child: FlowyHover(
resetHoverOnRebuild: resetHoverOnRebuild,
cursor:
disable ? SystemMouseCursors.forbidden : SystemMouseCursors.click,
style: HoverStyle(
Expand All @@ -82,11 +85,12 @@ class FlowyIconTextButton extends StatelessWidget {
Widget _render(BuildContext context, bool onHover) {
final List<Widget> children = [];

if (leftIconBuilder != null) {
final Widget? leftIcon = leftIconBuilder?.call(onHover);
if (leftIcon != null) {
children.add(
SizedBox.fromSize(
size: leftIconSize,
child: leftIconBuilder!(onHover),
child: leftIcon,
),
);
children.add(HSpace(iconPadding));
Expand All @@ -98,10 +102,11 @@ class FlowyIconTextButton extends StatelessWidget {
children.add(textBuilder(onHover));
}

if (rightIconBuilder != null) {
final Widget? rightIcon = rightIconBuilder?.call(onHover);
if (rightIcon != null) {
children.add(HSpace(iconPadding));
// No need to define the size of rightIcon. Just use its intrinsic width
children.add(rightIconBuilder!(onHover));
children.add(rightIcon);
}

Widget child = Row(
Expand Down
Loading