Skip to content

Commit f2ee13e

Browse files
authored
fix custom text selection not working (#1607)
1 parent b0b6eab commit f2ee13e

File tree

2 files changed

+14
-27
lines changed

2 files changed

+14
-27
lines changed

lib/app.dart

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@ import 'package:flutter_hooks/flutter_hooks.dart';
88
import 'package:flutter_localizations/flutter_localizations.dart';
99
import 'package:hooks_riverpod/hooks_riverpod.dart'
1010
hide Consumer, FutureProvider, Provider;
11-
import 'package:overlay_support/overlay_support.dart';
1211
import 'package:provider/provider.dart';
1312

1413
import 'account/account_key_value.dart';
1514
import 'account/notification_service.dart';
1615
import 'constants/brightness_theme_data.dart';
1716
import 'constants/resources.dart';
1817
import 'generated/l10n.dart';
19-
2018
import 'ui/home/bloc/conversation_list_bloc.dart';
2119
import 'ui/home/conversation/conversation_page.dart';
2220
import 'ui/home/home.dart';
@@ -61,11 +59,7 @@ class App extends HookConsumerWidget {
6159
} else {
6260
child = _LoginApp(authState: authState);
6361
}
64-
65-
return FocusHelper(
66-
child: Directionality(
67-
textDirection: TextDirection.ltr,
68-
child: OverlaySupport.local(child: child)));
62+
return FocusHelper(child: child);
6963
}
7064
}
7165

@@ -262,7 +256,7 @@ class _Home extends HookConsumerWidget {
262256
..limit = MediaQuery.sizeOf(context).height ~/
263257
(ConversationPage.conversationItemHeight / 1.75)
264258
..init();
265-
return const HomePage();
259+
return const PortalProviders(child: HomePage());
266260
}
267261
return const LandingPage();
268262
}

lib/ui/home/chat/voice_recorder_bottom_bar.dart

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import '../../../utils/load_balancer_utils.dart';
1717
import '../../../utils/logger.dart';
1818
import '../../../utils/system/audio_session.dart';
1919
import '../../../widgets/action_button.dart';
20-
import '../../../widgets/brightness_observer.dart';
2120
import '../../../widgets/dialog.dart';
2221
import '../../../widgets/toast.dart';
2322
import '../../../widgets/waveform_widget.dart';
@@ -192,15 +191,13 @@ class VoiceRecorderBarOverlayComposition extends HookConsumerWidget {
192191
converter: (state) => state.state != RecorderState.idle,
193192
);
194193
final link = useMemoized(LayerLink.new);
195-
final overlay = Overlay.of(context, rootOverlay: true);
194+
195+
final overlay = Navigator.of(context).overlay ?? Overlay.of(context);
196196

197197
final recorderBottomBarEntry = useRef<OverlayEntry?>(null);
198198

199199
final voiceRecorderCubit = context.read<VoiceRecorderCubit>();
200200

201-
final value = BrightnessData.of(context);
202-
final theme = BrightnessData.themeOf(context);
203-
204201
useEffect(
205202
() {
206203
recorderBottomBarEntry.value?.remove();
@@ -215,20 +212,16 @@ class VoiceRecorderBarOverlayComposition extends HookConsumerWidget {
215212
value: voiceRecorderCubit,
216213
),
217214
],
218-
child: BrightnessData(
219-
value: value,
220-
brightnessThemeData: theme,
221-
child: _RecordingInterceptor(
222-
child: UnconstrainedBox(
223-
child: CompositedTransformFollower(
224-
link: link,
225-
showWhenUnlinked: false,
226-
targetAnchor: Alignment.center,
227-
followerAnchor: Alignment.center,
228-
child: SizedBox(
229-
width: layoutWidth,
230-
child: const Material(child: VoiceRecorderBottomBar()),
231-
),
215+
child: _RecordingInterceptor(
216+
child: UnconstrainedBox(
217+
child: CompositedTransformFollower(
218+
link: link,
219+
showWhenUnlinked: false,
220+
targetAnchor: Alignment.center,
221+
followerAnchor: Alignment.center,
222+
child: SizedBox(
223+
width: layoutWidth,
224+
child: const Material(child: VoiceRecorderBottomBar()),
232225
),
233226
),
234227
),

0 commit comments

Comments
 (0)