Browse Source

fix: Filter UI popover pixels overflow with dynamic width and height (#2554)

Co-authored-by: gitstart <[email protected]>
GitStart 1 year ago
parent
commit
e69e72e3bd

+ 17 - 10
frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/choicechip/text.dart

@@ -117,18 +117,25 @@ class _TextFilterEditorState extends State<TextFilterEditor> {
       height: 20,
       child: Row(
         children: [
-          FlowyText(state.filterInfo.fieldInfo.name),
+          Expanded(
+            child: FlowyText(
+              state.filterInfo.fieldInfo.name,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
           const HSpace(4),
-          TextFilterConditionPBList(
-            filterInfo: state.filterInfo,
-            popoverMutex: popoverMutex,
-            onCondition: (condition) {
-              context
-                  .read<TextFilterEditorBloc>()
-                  .add(TextFilterEditorEvent.updateCondition(condition));
-            },
+          Expanded(
+            child: TextFilterConditionPBList(
+              filterInfo: state.filterInfo,
+              popoverMutex: popoverMutex,
+              onCondition: (condition) {
+                context
+                    .read<TextFilterEditorBloc>()
+                    .add(TextFilterEditorEvent.updateCondition(condition));
+              },
+            ),
           ),
-          const Spacer(),
+          const HSpace(4),
           DisclosureButton(
             popoverMutex: popoverMutex,
             onAction: (action) {

+ 1 - 0
frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/condition_button.dart

@@ -32,6 +32,7 @@ class ConditionButton extends StatelessWidget {
           conditionName,
           fontSize: 10,
           color: AFThemeExtension.of(context).textColor,
+          overflow: TextOverflow.ellipsis,
         ),
         margin: const EdgeInsets.symmetric(horizontal: 4),
         radius: const BorderRadius.all(Radius.circular(2)),