Merge PR #1510 into 2.0.0-beta.2

ui/flutter/lib/features/extensions/presentation/pages/extensions_page.dart

@@ -46,6 +46,9 @@ class ExtensionsPage extends ConsumerStatefulWidget {
 class _ExtensionsPageState extends ConsumerState<ExtensionsPage> {
   final _searchController = TextEditingController();
   final _installController = TextEditingController();
+  final _installAnchorKey = GlobalKey();
+  final _installPopoverKey = GlobalKey<_InstallPopoverState>();
+  bool _installDevMode = false;
   final _listScrollController = ScrollController();
   final Map<String, TextEditingController> _settingControllers = {};
   ExtensionListItem? _detailItem;
@@ -77,15 +80,28 @@ class _ExtensionsPageState extends ConsumerState<ExtensionsPage> {
   Widget build(BuildContext context) {
     final palette = AppPalette.of(context);
     final isDesktop = MediaQuery.sizeOf(context).width >= Breakpoints.mobile;
-    ref.listen(pendingExtensionInstallProvider, (previous, next) {
-      if (next == null) return;
-      ref.read(pendingExtensionInstallProvider.notifier).clear();
-      unawaited(
-        _runAction(
-          () => ref.read(extensionsControllerProvider.notifier).installFromUrl(next.url, devInstall: next.devMode),
-        ),
-      );
-    });
+    final pendingInstall = ref.watch(pendingExtensionInstallProvider);
+    if (pendingInstall != null) {
+      // The request can arrive before this page is mounted. Consume it only
+      // after the toolbar is laid out, so cold and warm links share the same UI.
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (!mounted || !identical(ref.read(pendingExtensionInstallProvider), pendingInstall)) return;
+        if (_installPopoverKey.currentState?._installing == true) return;
+        final anchorContext = _installAnchorKey.currentContext;
+        if (anchorContext == null) return;
+        _installController.text = pendingInstall.url;
+        _installDevMode = pendingInstall.devMode;
+        _showInstallPopover(anchorContext);
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (!mounted || !identical(ref.read(pendingExtensionInstallProvider), pendingInstall)) return;
+          final popover = _installPopoverKey.currentState;
+          if (popover == null || popover._installing) return;
+          ref.read(pendingExtensionInstallProvider.notifier).clear();
+          unawaited(popover._install());
+        });
+        WidgetsBinding.instance.ensureVisualUpdate();
+      });
+    }
     final stateAsync = ref.watch(extensionsControllerProvider);
     final body = Stack(
       children: [
@@ -153,6 +169,7 @@ class _ExtensionsPageState extends ConsumerState<ExtensionsPage> {
       onSearch: (query) => _runAction(() => ref.read(extensionsControllerProvider.notifier).searchStore(query)),
       onSort: (sort) => _runAction(() => ref.read(extensionsControllerProvider.notifier).changeSort(sort)),
       onFilter: ref.read(extensionsControllerProvider.notifier).changeFilter,
+      installAnchorKey: _installAnchorKey,
       onOpenInstall: _openInstallPopover,
       onDevelopExtension: _openExtensionDevelopmentDocs,
       onInstallFolder: _installFromFolder,
@@ -168,7 +185,9 @@ class _ExtensionsPageState extends ConsumerState<ExtensionsPage> {
   Future<void> _installFromUrl() async {
     final url = _installController.text.trim();
     if (url.isEmpty) return;
-    await _runAction(() => ref.read(extensionsControllerProvider.notifier).installFromUrl(url));
+    await _runAction(
+      () => ref.read(extensionsControllerProvider.notifier).installFromUrl(url, devInstall: _installDevMode),
+    );
   }
 
   Future<void> _loadNextPageIfNeeded() async {
@@ -192,6 +211,11 @@ class _ExtensionsPageState extends ConsumerState<ExtensionsPage> {
 
   void _openInstallPopover(BuildContext anchorContext) {
     ref.read(extensionsControllerProvider.notifier).tryOpenDevMode();
+    _installDevMode = false;
+    _showInstallPopover(anchorContext);
+  }
+
+  void _showInstallPopover(BuildContext anchorContext) {
     if (_installPopover != null) return;
     final overlay = const shad.PopoverOverlayHandler().show<void>(
       context: anchorContext,
@@ -200,7 +224,14 @@ class _ExtensionsPageState extends ConsumerState<ExtensionsPage> {
       offset: const Offset(0, 8),
       modal: false,
       consumeOutsideTaps: false,
-      builder: (context) => _InstallPopover(controller: _installController, onInstallUrl: _installFromUrl),
+      builder: (context) => _InstallPopover(
+        key: _installPopoverKey,
+        controller: _installController,
+        onInstallUrl: _installFromUrl,
+        onFinished: () {
+          if (mounted && ref.read(pendingExtensionInstallProvider) != null) setState(() {});
+        },
+      ),
     );
     _installPopover = overlay;
     unawaited(
@@ -283,6 +314,7 @@ class _Content extends StatelessWidget {
     required this.onSearch,
     required this.onSort,
     required this.onFilter,
+    required this.installAnchorKey,
     required this.onOpenInstall,
     required this.onDevelopExtension,
     required this.onInstallFolder,
@@ -300,6 +332,7 @@ class _Content extends StatelessWidget {
   final ValueChanged<String> onSearch;
   final ValueChanged<StoreExtensionSort> onSort;
   final ValueChanged<ExtensionListFilter> onFilter;
+  final GlobalKey installAnchorKey;
   final ValueChanged<BuildContext> onOpenInstall;
   final VoidCallback onDevelopExtension;
   final VoidCallback onInstallFolder;
@@ -321,6 +354,7 @@ class _Content extends StatelessWidget {
       onSearch: onSearch,
       onSort: onSort,
       onRefresh: onRefresh,
+      installAnchorKey: installAnchorKey,
       onOpenInstall: onOpenInstall,
       onDevelopExtension: onDevelopExtension,
       onInstallFolder: onInstallFolder,
@@ -613,6 +647,7 @@ class _Toolbar extends StatelessWidget {
     required this.onSearch,
     required this.onSort,
     required this.onRefresh,
+    required this.installAnchorKey,
     required this.onOpenInstall,
     required this.onDevelopExtension,
     required this.onInstallFolder,
@@ -623,6 +658,7 @@ class _Toolbar extends StatelessWidget {
   final ValueChanged<String> onSearch;
   final ValueChanged<StoreExtensionSort> onSort;
   final VoidCallback onRefresh;
+  final GlobalKey installAnchorKey;
   final ValueChanged<BuildContext> onOpenInstall;
   final VoidCallback onDevelopExtension;
   final VoidCallback onInstallFolder;
@@ -683,6 +719,7 @@ class _Toolbar extends StatelessWidget {
           const SizedBox(width: 8),
         ],
         Builder(
+          key: installAnchorKey,
           builder: (buttonContext) => _OutlineToolbarIconButton(
             key: const ValueKey('install-extension-button'),
             tooltip: context.l10n.extensionInstallFromUrl,
@@ -795,10 +832,11 @@ class _OutlineToolbarIconButton extends StatelessWidget {
 }
 
 class _InstallPopover extends StatefulWidget {
-  const _InstallPopover({required this.controller, required this.onInstallUrl});
+  const _InstallPopover({super.key, required this.controller, required this.onInstallUrl, required this.onFinished});
 
   final TextEditingController controller;
   final Future<void> Function() onInstallUrl;
+  final VoidCallback onFinished;
 
   @override
   State<_InstallPopover> createState() => _InstallPopoverState();
@@ -860,8 +898,8 @@ class _InstallPopoverState extends State<_InstallPopover> {
     setState(() => _installing = true);
     await widget.onInstallUrl();
     if (!mounted) return;
-    setState(() => _installing = false);
     await shad.closeOverlay(context);
+    widget.onFinished();
   }
 }